]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 17:47:19 +0000 (19:47 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 9 May 2012 17:47:19 +0000 (19:47 +0200)
commit2a0fb1db6931327113906d0a95c0c4fa90a377e1
tree9ec47a3a510ffdc834fb1d78bbd9b151a3bd35c1
parentd13ba7ca530c6063e3bab626f6d679c999ec933f
parent8b55b2c24cff88aebaad1882e93ec49b9c2396af
Merge branch 'master' into next