projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08f433f 4812f01)
Merge with trunk.
authorWaqas Hussain <waqas20@gmail.com>
Mon, 25 Jan 2010 21:10:25 +0000 (02:10 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Mon, 25 Jan 2010 21:10:25 +0000 (02:10 +0500)

Trivial merge