projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 758fe42 23ccd6f)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Mon, 3 Aug 2009 16:52:17 +0000 (17:52 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 3 Aug 2009 16:52:17 +0000 (17:52 +0100)

Trivial merge