projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edfec5f 402fd8a)
Merge
authorKim Alvefur <zash@zash.se>
Fri, 18 Mar 2016 10:55:40 +0000 (11:55 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 18 Mar 2016 10:55:40 +0000 (11:55 +0100)

Trivial merge