projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcaa679 2412dfb)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 4 Mar 2016 22:28:15 +0000 (22:28 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 4 Mar 2016 22:28:15 +0000 (22:28 +0000)

Trivial merge