projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4aa069c b11cb25)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 1 May 2013 12:45:42 +0000 (13:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 1 May 2013 12:45:42 +0000 (13:45 +0100)

Trivial merge