From: luke bonham <dada@archlinux.info>
Date: Sun, 11 Jan 2015 12:16:37 +0000 (+0100)
Subject: Merge branch 'worron-master'
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/3cd8b2001381997e1556c95c12eb0736fe6f7ebc?ds=sidebyside

Merge branch 'worron-master'
---

3cd8b2001381997e1556c95c12eb0736fe6f7ebc