projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 802a92e 404520e)
Merge 0.9->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Mon, 3 Dec 2012 05:04:34 +0000 (10:04 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Mon, 3 Dec 2012 05:04:34 +0000 (10:04 +0500)

Trivial merge