projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f18ff8 c737160)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Thu, 29 Jan 2009 17:54:37 +0000 (17:54 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 29 Jan 2009 17:54:37 +0000 (17:54 +0000)

Trivial merge