]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 19:08:28 +0000 (21:08 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 19:08:28 +0000 (21:08 +0200)
commited957d60a76480fede5f4efc5c12467718144b03
tree8b6d47735013bcb2f4ed9ebe1396c1601e18fe8e
parenteab9f46c3371e84d9ebb5467dd432e781a7a76f2
parent56f6d01ba320722412fdd455ae6ecf66a79f3455
Merge branch 'master' into next