]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Nov 2011 20:34:54 +0000 (20:34 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 30 Nov 2011 20:34:54 +0000 (20:34 +0000)
commit6c112f2a9a5de4c3ef06d4cbce2bd7b22c0caa1d
tree07f0adb97aac9dcb84bf052148e1147cdac3e9a1
parentfb90a556c88027b2ba639037bacb55770414a4e2
parent70e6ba1d0b0ee77abaed26e4ce73c361fbec088e
Merge branch 'master' into next