From: Aleksandr Beliaev <trap000d@gmail.com>
Date: Thu, 2 Jun 2016 09:51:18 +0000 (+1200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/c0fd4e8f6471610142a4b5ca34ea3d6ad3c4c2b8?ds=sidebyside;hp=-c

Merge remote-tracking branch 'upstream/master'
---

c0fd4e8f6471610142a4b5ca34ea3d6ad3c4c2b8