projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9df390 fd91a78)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 26 Aug 2012 18:58:59 +0000 (19:58 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 26 Aug 2012 18:58:59 +0000 (19:58 +0100)

Trivial merge