projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f54e7a c0084cf)
Merge with Prosody trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 8 May 2014 17:09:59 +0000 (18:09 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 8 May 2014 17:09:59 +0000 (18:09 +0100)

Trivial merge