]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 15:44:59 +0000 (17:44 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 15:44:59 +0000 (17:44 +0200)
commitaa65b507ad107053a0d11989080dbc94b0f63d17
tree22d1b5f4b74aefe58c91b3b4f6f3f1fc681ae296
parent57e7266da4d5576878375a722f0f186e70fc2ee3
parent1d83e776f11925f553fe6501d04a60aaa7448787
Merge branch 'master' into next