projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ae195e 483a94f)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 5 Feb 2016 15:31:34 +0000 (16:31 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 5 Feb 2016 15:31:34 +0000 (16:31 +0100)

Trivial merge