]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 26 Nov 2011 21:19:30 +0000 (21:19 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 26 Nov 2011 21:19:30 +0000 (21:19 +0000)
commit555dd48f09a1aceb7429a5c575b0e64070e923e4
tree1d38815f41f7b907db92643b49527cc3d61c3e10
parentd805d1bbeaf89e11f67c981f94c9f55bbb4b89d9
parentd213f537a5063279ce2d7b4fff479d3ed5510267
Merge branch 'master' into next