projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9c66ad 89ad754)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 5 Mar 2016 20:50:17 +0000 (20:50 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 5 Mar 2016 20:50:17 +0000 (20:50 +0000)

Trivial merge