projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64a8c92 49f7706)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 24 Feb 2015 15:22:34 +0000 (15:22 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 24 Feb 2015 15:22:34 +0000 (15:22 +0000)

Trivial merge