projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f9244c 22f9bfc)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 13 Dec 2015 20:22:26 +0000 (21:22 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 13 Dec 2015 20:22:26 +0000 (21:22 +0100)

Trivial merge