]> git.sur5r.net Git - i3/i3/commitdiff
Merge branch 'desktop-file'
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 20 Sep 2012 09:34:26 +0000 (11:34 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 20 Sep 2012 09:34:26 +0000 (11:34 +0200)

Trivial merge