projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 031bcbe 481ee86)
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Fri, 29 Nov 2013 20:11:06 +0000 (20:11 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 29 Nov 2013 20:11:06 +0000 (20:11 +0000)

Trivial merge