projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f323bee 625789e)
Merge...
authorKim Alvefur <zash@zash.se>
Thu, 3 Dec 2015 15:46:24 +0000 (16:46 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 3 Dec 2015 15:46:24 +0000 (16:46 +0100)

Trivial merge