projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d09aad9 38b2c09)
Merge with backout
authorMatthew Wild <mwild1@gmail.com>
Sat, 13 Feb 2010 15:34:33 +0000 (15:34 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 13 Feb 2010 15:34:33 +0000 (15:34 +0000)

Trivial merge