projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e79fcdc d7500b7)
Merge with merge
authorKim Alvefur <zash@zash.se>
Thu, 26 Mar 2015 23:28:16 +0000 (00:28 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 26 Mar 2015 23:28:16 +0000 (00:28 +0100)

Trivial merge