projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1c7196 d6696f3)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 27 Dec 2015 11:29:28 +0000 (12:29 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 27 Dec 2015 11:29:28 +0000 (12:29 +0100)

Trivial merge