projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cacc699 65839b3)
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Fri, 24 Jun 2016 13:11:06 +0000 (15:11 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 24 Jun 2016 13:11:06 +0000 (15:11 +0200)

Trivial merge