From: trap000d <trap000d@gmail.com>
Date: Thu, 8 Dec 2016 01:38:29 +0000 (+1300)
Subject: Merge pull request #1 from copycat-killer/master
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/b8adf932213faa797fcd69df28bb8bf9451cf5df?hp=2d67c3962019c47529f357a3c347288c905257b2

Merge pull request #1 from copycat-killer/master

Merge upstream
---