projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b06c695 0b1fed4)
Merged from Matthew
authorWaqas Hussain <waqas20@gmail.com>
Thu, 23 Oct 2008 17:07:36 +0000 (22:07 +0500)
committerWaqas Hussain <waqas20@gmail.com>
Thu, 23 Oct 2008 17:07:36 +0000 (22:07 +0500)

Trivial merge