projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 894e410 70e1901)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Fri, 2 Oct 2009 21:37:44 +0000 (22:37 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 2 Oct 2009 21:37:44 +0000 (22:37 +0100)

Trivial merge