projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9769da5 31af2a4)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 27 Mar 2015 22:24:57 +0000 (22:24 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 27 Mar 2015 22:24:57 +0000 (22:24 +0000)

Trivial merge