projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c71da57 f672c86)
Merge 0.7->trunk
authorWaqas Hussain <waqas20@gmail.com>
Thu, 6 May 2010 12:14:11 +0000 (17:14 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 6 May 2010 12:14:11 +0000 (17:14 +0500)

Trivial merge