]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 18:39:26 +0000 (20:39 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 18:39:26 +0000 (20:39 +0200)
commiteab9f46c3371e84d9ebb5467dd432e781a7a76f2
tree98f77af79704bad332d070c13918c1003c1ccfa2
parentc04343d26d72ff60ba1f791ff150e9d9eafa5afc
parent687ad3b44ed5b9c093127e865d2a0db2478ce24b
Merge branch 'master' into next