projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 828e2f5 3cd0dbd)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 17:04:43 +0000 (18:04 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 17:04:43 +0000 (18:04 +0100)

Trivial merge