projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 730b1ac 0187426)
Merge with trunk
authorWaqas Hussain <waqas20@gmail.com>
Thu, 4 Jun 2009 15:48:23 +0000 (20:48 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 4 Jun 2009 15:48:23 +0000 (20:48 +0500)

Trivial merge