projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b244d86 b62a920)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 28 Jan 2016 14:11:33 +0000 (15:11 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 28 Jan 2016 14:11:33 +0000 (15:11 +0100)

Trivial merge