projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 090bf61 77b4f86)
Merge with trunk.
authorWaqas Hussain <waqas20@gmail.com>
Thu, 11 Feb 2010 21:50:57 +0000 (02:50 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 11 Feb 2010 21:50:57 +0000 (02:50 +0500)

Trivial merge