projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99dfb69 3b4608d)
Automated merge with http://waqas.ath.cx/
authorMatthew Wild <mwild1@gmail.com>
Thu, 4 Dec 2008 18:49:00 +0000 (18:49 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 4 Dec 2008 18:49:00 +0000 (18:49 +0000)

Trivial merge