projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c50795 d6b5e91)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Mon, 5 Oct 2009 16:57:59 +0000 (17:57 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 5 Oct 2009 16:57:59 +0000 (17:57 +0100)

Trivial merge