projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9eeb5ce 7b864c6)
Automated merge with http://waqas.ath.cx:8000/
authorMatthew Wild <mwild1@gmail.com>
Wed, 4 Mar 2009 18:48:29 +0000 (18:48 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 4 Mar 2009 18:48:29 +0000 (18:48 +0000)

Trivial merge