projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 912e11d 92d10b3)
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sun, 11 Oct 2015 18:00:15 +0000 (20:00 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 11 Oct 2015 18:00:15 +0000 (20:00 +0200)

Trivial merge