projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 612d004 5abe5c9)
Merge
authorKim Alvefur <zash@zash.se>
Thu, 3 Dec 2015 15:17:40 +0000 (16:17 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 3 Dec 2015 15:17:40 +0000 (16:17 +0100)

Trivial merge