projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8ac25f bdae90d)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Fri, 9 Jan 2009 19:19:06 +0000 (19:19 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 9 Jan 2009 19:19:06 +0000 (19:19 +0000)

Trivial merge