From: Steven Schubiger <stsc@refcnt.org>
Date: Fri, 13 Sep 2019 19:15:22 +0000 (+0200)
Subject: Merge branch 'config_file'
X-Git-Tag: v0.65~14
X-Git-Url: http://git.refcnt.org/?p=colorize.git;a=commitdiff_plain;h=b5ff1ba35b959261c855262b6e820732e72b0bfe;hp=660177bb22c5b8b54c0ec3aabd1930fd49584e23

Merge branch 'config_file'
---