projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eafb468 422ec09)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 24 Mar 2016 12:57:58 +0000 (13:57 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 24 Mar 2016 12:57:58 +0000 (13:57 +0100)

Trivial merge