projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b14412c 413e691)
Merge with backout
authorMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:48:28 +0000 (18:48 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:48:28 +0000 (18:48 +0100)

Trivial merge