From: Aleksandr Beliaev 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?ds=sidebyside;hp=095bff7b26eb55b84753fbfe556ff7d9f452cfa0 Merge remote-tracking branch 'upstream/master' Merge with upstream/master ---