projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3091591 53d0f8b)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 10 Mar 2016 17:55:40 +0000 (17:55 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 10 Mar 2016 17:55:40 +0000 (17:55 +0000)

Trivial merge