projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3601083 64a3387)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 23:08:58 +0000 (00:08 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 17 Mar 2016 23:08:58 +0000 (00:08 +0100)

Trivial merge