projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 668e61c 3ebf113)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 12 Jan 2014 11:27:55 +0000 (06:27 -0500)
committerMatthew Wild <mwild1@gmail.com>
Sun, 12 Jan 2014 11:27:55 +0000 (06:27 -0500)

Trivial merge