]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 22 Aug 2011 10:44:58 +0000 (12:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 22 Aug 2011 10:44:58 +0000 (12:44 +0200)
commitcc2ca32b13d15125a4a7f83ddf1af2b55b4bbb13
tree73d7aaeb3eab06da82d5e41388a4ab1c60c00754
parent2cd8231fce33bd312ec818724d9225ff8b20255a
parentdf076113a69c9af74369dcf65f5fbe205f52769b
Merge branch 'master' into next