projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b19869e e7640ca)
Automated merge with http://waqas.ath.cx/
authorMatthew Wild <mwild1@gmail.com>
Wed, 3 Dec 2008 17:24:20 +0000 (17:24 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 3 Dec 2008 17:24:20 +0000 (17:24 +0000)

Trivial merge