projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a367b6 075dc53)
Merge
authorKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:07:33 +0000 (18:07 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:07:33 +0000 (18:07 +0200)

Trivial merge