projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7eeecdb 1b01b4f)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 11 Dec 2013 22:32:17 +0000 (22:32 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 11 Dec 2013 22:32:17 +0000 (22:32 +0000)

Trivial merge