projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2289a8 8708def)
Merge
authorKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 23:06:30 +0000 (00:06 +0100)
committerKim Alvefur <zash@zash.se>
Tue, 26 Jan 2016 23:06:30 +0000 (00:06 +0100)

Trivial merge