projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0406b86 89be8bc)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 18:27:13 +0000 (19:27 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 18:27:13 +0000 (19:27 +0100)

Trivial merge