projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53bf45a ee8527f)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 18 Apr 2011 19:39:37 +0000 (20:39 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 18 Apr 2011 19:39:37 +0000 (20:39 +0100)

Trivial merge