]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 1 Jan 2014 10:10:26 +0000 (11:10 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 1 Jan 2014 10:10:26 +0000 (11:10 +0100)
commit67b213665b7f4dc5302c5f39bf0c761c3e762fc3
treef6dfb4c5b91fd35cc37e0a08c8ab613adf10765c
parent1e1e4ef9df847dac31da235cdf467bbcc2452e24
parent3ebc6654cde90a66b2560d1ef542270d82b9a5fd
Merge branch 'master' into next