From: Aleksandr Beliaev <trap000d@gmail.com>
Date: Sun, 5 Jun 2016 02:01:46 +0000 (+1200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/f48a09207ccab524b933b5a0e2e55865d38fca92?hp=7bc886679daf7dea81838ab792c91a78ecdd4804

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