projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bece717 af5dd56)
Merge with backout
authorMatthew Wild <mwild1@gmail.com>
Fri, 11 May 2012 20:35:08 +0000 (21:35 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 11 May 2012 20:35:08 +0000 (21:35 +0100)

Trivial merge