projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a812eb 4e0ac85)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 15 Jul 2013 22:43:37 +0000 (23:43 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 15 Jul 2013 22:43:37 +0000 (23:43 +0100)

Trivial merge