]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 20 Sep 2012 08:56:58 +0000 (10:56 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 20 Sep 2012 08:56:58 +0000 (10:56 +0200)
commit485b49bbe306563c7bd45a544ad06a7916fe40da
tree30f84b6c3165f9fe284c63a42e2381cd71908d42
parent1bc41edb6daa5e92ee58a6ffd896e4f538f6dea7
parente1e898f8e1bde3511f901956455a88febc229ed9
Merge branch 'master' into next