projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9991689 e33dda0)
Merge 0.8->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Thu, 24 Feb 2011 14:30:26 +0000 (19:30 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 24 Feb 2011 14:30:26 +0000 (19:30 +0500)

Trivial merge