projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bbea26 c775563)
Automated merge with http://waqas.ath.cx/
authorMatthew Wild <mwild1@gmail.com>
Thu, 4 Dec 2008 15:48:19 +0000 (15:48 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 4 Dec 2008 15:48:19 +0000 (15:48 +0000)

Trivial merge