projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 329548a 67081a9)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Dec 2008 01:37:13 +0000 (01:37 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 25 Dec 2008 01:37:13 +0000 (01:37 +0000)

Trivial merge