projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: affdd67 9ae83d5)
Merge 0.9->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Fri, 30 Nov 2012 19:31:33 +0000 (00:31 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Fri, 30 Nov 2012 19:31:33 +0000 (00:31 +0500)

Trivial merge