From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 14 Mar 2013 14:20:34 +0000 (+0100)
Subject: Merge branch 'fix-make'
X-Git-Tag: 4.5.1~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aea25407df3b3ed38671a6aeddff75940f592ccf;p=i3%2Fi3

Merge branch 'fix-make'
---

aea25407df3b3ed38671a6aeddff75940f592ccf