projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58276bf 88b01c6)
Merge with a merge (or something)
authorMatthew Wild <mwild1@gmail.com>
Thu, 22 Nov 2012 21:02:27 +0000 (21:02 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 22 Nov 2012 21:02:27 +0000 (21:02 +0000)

Trivial merge