projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cacbd9 6b4c778)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 20 Nov 2014 09:02:23 +0000 (09:02 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 20 Nov 2014 09:02:23 +0000 (09:02 +0000)

Trivial merge