projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c561ed 9a14d84)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 18 Feb 2016 18:09:37 +0000 (19:09 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 18 Feb 2016 18:09:37 +0000 (19:09 +0100)

Trivial merge