projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a4ea53 c3f3aca)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 22 Feb 2016 17:46:59 +0000 (18:46 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 22 Feb 2016 17:46:59 +0000 (18:46 +0100)

Trivial merge