projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c653d64 d152a3c)
Automated merge with http://waqas.ath.cx/
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Nov 2008 19:09:38 +0000 (19:09 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 29 Nov 2008 19:09:38 +0000 (19:09 +0000)

Trivial merge