projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0df2760 cb8e859)
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Tue, 12 Nov 2013 02:23:02 +0000 (02:23 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 12 Nov 2013 02:23:02 +0000 (02:23 +0000)

Trivial merge