projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7db4b9 87322db)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:54:56 +0000 (18:54 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:54:56 +0000 (18:54 +0100)

Trivial merge