projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c8bc3e 41caabe)
Automated merge with http://waqas.ath.cx/
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Nov 2008 03:28:07 +0000 (03:28 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 29 Nov 2008 03:28:07 +0000 (03:28 +0000)

Trivial merge