projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61f7061 2de87df)
Merge with 0.6.
authorWaqas Hussain <waqas20@gmail.com>
Thu, 26 Nov 2009 08:06:52 +0000 (13:06 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 26 Nov 2009 08:06:52 +0000 (13:06 +0500)

Trivial merge