projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e86ddaf fe5db5d)
Merge with trunk.
authorWaqas Hussain <waqas20@gmail.com>
Wed, 25 Nov 2009 19:05:18 +0000 (00:05 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Wed, 25 Nov 2009 19:05:18 +0000 (00:05 +0500)

Trivial merge