From: luke bonham <dada@archlinux.info>
Date: Fri, 26 Sep 2014 10:38:22 +0000 (+0200)
Subject: Merge branch 'projektile-master'
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/1ed42223a2857770aa85da863213cdfb29f7d426

Merge branch 'projektile-master'
---

1ed42223a2857770aa85da863213cdfb29f7d426