projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e03af6c d6838e4)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 18 Jan 2014 18:46:31 +0000 (18:46 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 18 Jan 2014 18:46:31 +0000 (18:46 +0000)

Trivial merge