From: Aleksandr Beliaev <trap000d@gmail.com>
Date: Thu, 2 Jun 2016 07:39:25 +0000 (+1200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/095bff7b26eb55b84753fbfe556ff7d9f452cfa0?hp=2d8e93f18961e2d5c051b749e667a0ddc9d14ae3

Merge remote-tracking branch 'upstream/master'

Merge with upstream/master
---