projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5336d95 08fbe2c)
Merged with trunk.
authorWaqas Hussain <waqas20@gmail.com>
Wed, 21 Oct 2009 07:02:30 +0000 (12:02 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Wed, 21 Oct 2009 07:02:30 +0000 (12:02 +0500)

Trivial merge