projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f2eb68 406939f)
Merge with Paul
authorMatthew Wild <mwild1@gmail.com>
Sun, 3 Jan 2010 17:54:26 +0000 (17:54 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 3 Jan 2010 17:54:26 +0000 (17:54 +0000)

Trivial merge