projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b53917 e598b17)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 1 Jan 2016 22:31:13 +0000 (23:31 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 1 Jan 2016 22:31:13 +0000 (23:31 +0100)

Trivial merge