From: Josh Timmer <0ohexxo0@gmail.com>
Date: Thu, 17 Sep 2015 19:38:44 +0000 (-0400)
Subject: Merged with upstream
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/06621e5bdd737749cda8adf1c84d72a2ba468475?ds=sidebyside;hp=-c

Merged with upstream
---

06621e5bdd737749cda8adf1c84d72a2ba468475