projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f80746d 9999ee5)
Merge with 0.5
authorMatthew Wild <mwild1@gmail.com>
Mon, 27 Jul 2009 21:42:36 +0000 (22:42 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 27 Jul 2009 21:42:36 +0000 (22:42 +0100)

Trivial merge