projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70eacd6 4dfa640)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 27 Apr 2013 12:11:27 +0000 (13:11 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 27 Apr 2013 12:11:27 +0000 (13:11 +0100)

Trivial merge