From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 1 Aug 2011 16:09:47 +0000 (+0200)
Subject: Merge branch 'darwin-fixes' into next
X-Git-Tag: 4.0.1~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=784ab40cd17cbc16d18ca87be5e889d4006c584c;p=i3%2Fi3

Merge branch 'darwin-fixes' into next
---

784ab40cd17cbc16d18ca87be5e889d4006c584c