From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 10 Oct 2011 14:54:23 +0000 (+0100)
Subject: Merge branch 'startup-notification' into next
X-Git-Tag: 4.1~104
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=819980ce2b2e3549eb99d91557dfe0d0602fa540;p=i3%2Fi3

Merge branch 'startup-notification' into next
---

819980ce2b2e3549eb99d91557dfe0d0602fa540