projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af387ca b95dff1)
Merge 0.9->trunk
authorWaqas Hussain <waqas20@gmail.com>
Tue, 22 Jan 2013 03:30:38 +0000 (08:30 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Tue, 22 Jan 2013 03:30:38 +0000 (08:30 +0500)

Trivial merge