projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb623b7 1be81fe)
Merge with trunk.
authorWaqas Hussain <waqas20@gmail.com>
Fri, 4 Jun 2010 13:38:35 +0000 (18:38 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Fri, 4 Jun 2010 13:38:35 +0000 (18:38 +0500)

Trivial merge