projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4087a96 cf946c9)
Merge 0.9->trunk
authorWaqas Hussain <waqas20@gmail.com>
Tue, 28 Aug 2012 00:12:25 +0000 (05:12 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Tue, 28 Aug 2012 00:12:25 +0000 (05:12 +0500)

Trivial merge