From: Orillion <redacted>
Date: Mon, 27 Nov 2017 19:26:07 +0000 (+0000)
Subject: Merge branch 'xmas2017-fixes' into 'master'
X-Git-Url: https://jfr.im/git/irc/rizon/acid.git/commitdiff_plain/99162bd7e0d5ef071453c1e52258bafd2d8c3c7c

Merge branch 'xmas2017-fixes' into 'master'

Xmas2017 fixes

Closes #25

See merge request rizon/acid!78
---

99162bd7e0d5ef071453c1e52258bafd2d8c3c7c