projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 155b53a a03fd32)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 19 Mar 2016 21:46:41 +0000 (22:46 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 19 Mar 2016 21:46:41 +0000 (22:46 +0100)

Trivial merge