projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f77351c 502ba0c)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 3 Mar 2016 15:06:16 +0000 (16:06 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 3 Mar 2016 15:06:16 +0000 (16:06 +0100)

Trivial merge