projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9c3ca5 a64ebc4)
Automated merge with http://luaetta.ath.cx:1234/
authorMatthew Wild <mwild1@gmail.com>
Tue, 3 Mar 2009 17:18:43 +0000 (17:18 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 3 Mar 2009 17:18:43 +0000 (17:18 +0000)

Trivial merge