projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 981bcb0 75b6361)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 3 Feb 2016 22:02:36 +0000 (23:02 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 3 Feb 2016 22:02:36 +0000 (23:02 +0100)

Trivial merge