projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12ce18c 780c888)
Merge 0.8->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Wed, 2 Mar 2011 00:15:54 +0000 (05:15 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Wed, 2 Mar 2011 00:15:54 +0000 (05:15 +0500)

Trivial merge