projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cef49e9 add3f50)
Automated merge with http://84.46.7.57:1234
authorMatthew Wild <mwild1@gmail.com>
Wed, 3 Dec 2008 19:34:41 +0000 (19:34 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 3 Dec 2008 19:34:41 +0000 (19:34 +0000)

Trivial merge