]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 19:26:29 +0000 (20:26 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 7 Mar 2015 19:26:29 +0000 (20:26 +0100)
commit7270f6e96fc4cd75859fd48dc80bcb8902ae1614
tree2a7f1ce2d6a05fb995c8fd8e9af79e30b4dcc110
parent0148dc6fd30a41b7005ccdf6cda921b34c1ac592
parent309e5b2cbdc97ab0aa6b979ed7d260bed57315e1
Merge branch 'master' into next