projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe8d600 04bc83b)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 13 Dec 2013 12:53:14 +0000 (12:53 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 13 Dec 2013 12:53:14 +0000 (12:53 +0000)

Trivial merge