projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3eb08a 3f43b54)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 3 Feb 2016 01:13:03 +0000 (02:13 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 3 Feb 2016 01:13:03 +0000 (02:13 +0100)

Trivial merge