projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13ecd90 8ac7dd5)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Wed, 24 Dec 2008 23:19:48 +0000 (23:19 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 24 Dec 2008 23:19:48 +0000 (23:19 +0000)

Trivial merge