projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 658a435 26f5fc0)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 21 Jan 2014 03:26:04 +0000 (03:26 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 21 Jan 2014 03:26:04 +0000 (03:26 +0000)

Trivial merge