From: copycat-killer <dada@archlinux.info>
Date: Tue, 7 Feb 2017 08:08:21 +0000 (+0100)
Subject: Merge branch 'trap000d-master'
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/33223f2816470636c45b280c77b9da57d5fb9d4b

Merge branch 'trap000d-master'
---

33223f2816470636c45b280c77b9da57d5fb9d4b