projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5708de6 c580086)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 14 May 2013 08:39:32 +0000 (09:39 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 14 May 2013 08:39:32 +0000 (09:39 +0100)

Trivial merge