projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6481c65 c9ce85a)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 20 Jan 2016 13:46:27 +0000 (14:46 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 20 Jan 2016 13:46:27 +0000 (14:46 +0100)

Trivial merge