projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9170078 a0b3d9a)
Merge with 0.6.
authorWaqas Hussain <waqas20@gmail.com>
Sun, 29 Nov 2009 13:29:19 +0000 (18:29 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Sun, 29 Nov 2009 13:29:19 +0000 (18:29 +0500)

Trivial merge