projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c6805a 1d6b350)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 14 Mar 2016 16:38:50 +0000 (17:38 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 14 Mar 2016 16:38:50 +0000 (17:38 +0100)

Trivial merge