]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Sep 2011 19:55:13 +0000 (20:55 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Sep 2011 19:55:13 +0000 (20:55 +0100)
commitb4ab4703c9927f88a0ead3c0aa9df2a3155dc917
tree78de3791a54acc1e327c6a501b08aed854682816
parent4dc0a86fafdf0399eb6d1cdba95cc14ae5ed905b
parent1fbe070f0385fb2e25af7078fdea6b8a324bf2e2
Merge branch 'master' into next