projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ea5e2a c7381b2)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 21 Mar 2016 13:52:43 +0000 (14:52 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 21 Mar 2016 13:52:43 +0000 (14:52 +0100)

Trivial merge