projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 049d5c4 9b2cfbb)
Merge with 0.5
authorWaqas Hussain <waqas20@gmail.com>
Tue, 13 Oct 2009 10:00:59 +0000 (15:00 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Tue, 13 Oct 2009 10:00:59 +0000 (15:00 +0500)

Trivial merge