]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 25 Jun 2014 08:00:59 +0000 (10:00 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 25 Jun 2014 08:00:59 +0000 (10:00 +0200)
commite594086757d4d79cdfb963b1e5911bc37c34cade
treea8ef602d7758876001065da4c41e1d8d6d0549ee
parentb91cd347e4a40d6d160cb74f1adf61bb7bb9a2bc
parent653b9453768dd4219b8d6015de0983beff8130b7
Merge branch 'master' into next