]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 18:18:03 +0000 (20:18 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 18:18:03 +0000 (20:18 +0200)
commita4804a53b8ecf5e5f7d6ee9266cd8d9501e090df
treef0d21b941cabd5c79152898419e8bcfb98b8f2f8
parentabafb2b235102ea561c632391ad525f7e1c9e148
parent79802cf82477d3f413fb0fc07d8e7b342be63c68
Merge branch 'master' into next