From: copycat-killer <dada@archlinux.info>
Date: Mon, 12 Oct 2015 10:09:44 +0000 (+0200)
Subject: merge and resolve conflicts from #134; #114
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/912bd26ede8901c98fd8d7a35f8493ee448109ad?ds=inline;hp=912bd26ede8901c98fd8d7a35f8493ee448109ad

merge and resolve conflicts from #134; #114
---