From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 20 Sep 2012 09:34:26 +0000 (+0200)
Subject: Merge branch 'desktop-file'
X-Git-Tag: 4.4~153^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=393a1c085123ff520875bee1d953702035984f59;p=i3%2Fi3

Merge branch 'desktop-file'
---

393a1c085123ff520875bee1d953702035984f59