projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 674c091 3aa1c58)
Merge with trunk.
authorWaqas Hussain <waqas20@gmail.com>
Sat, 17 Jul 2010 14:36:14 +0000 (19:36 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Sat, 17 Jul 2010 14:36:14 +0000 (19:36 +0500)

Trivial merge