projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bca35c2 a6168c7)
Merge 0.10->trunk master
authorKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 16:43:33 +0000 (18:43 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 16:43:33 +0000 (18:43 +0200)

Trivial merge