projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43bb3c3 c6ba514)
Merge 0.8->trunk.
authorWaqas Hussain <waqas20@gmail.com>
Sun, 20 Feb 2011 14:21:44 +0000 (19:21 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Sun, 20 Feb 2011 14:21:44 +0000 (19:21 +0500)

Trivial merge