projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91c5891 4ebce39)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 26 Nov 2015 00:19:31 +0000 (00:19 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 26 Nov 2015 00:19:31 +0000 (00:19 +0000)

Trivial merge