projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f64aaf b22a1e6)
Merge (some of) trunk -> 0.9
authorMatthew Wild <mwild1@gmail.com>
Thu, 5 Jul 2012 16:41:57 +0000 (17:41 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 5 Jul 2012 16:41:57 +0000 (17:41 +0100)

Trivial merge