]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 8 Aug 2013 20:44:30 +0000 (22:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 8 Aug 2013 20:44:30 +0000 (22:44 +0200)
commitcc36c94b6039e2160a901c2c4f4d5b7bda648746
tree17923f43107527cad454ce0e99d21037098f3c12
parent3be0b519c9a68ef7403d6dcffb1ccc381117ac2c
parent4fbc832f663d9cb073bf3ed5f560a77db7aa5589
Merge branch 'master' into next