projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb4d217 9842285)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 29 Jun 2013 09:11:55 +0000 (10:11 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 29 Jun 2013 09:11:55 +0000 (10:11 +0100)

Trivial merge