projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c12b908 122fe9a)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Fri, 7 Aug 2009 10:32:47 +0000 (11:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 7 Aug 2009 10:32:47 +0000 (11:32 +0100)

Trivial merge