]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 20 Jan 2012 18:14:34 +0000 (18:14 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 20 Jan 2012 18:14:34 +0000 (18:14 +0000)
commit57bf93ebaf025e610970841908611512e03a1a1d
treeba99987463b040c9096447fe3783b1181eac67d9
parent759ed0b6e3983bec11fab20c3174c95aac5c7a4d
parentaf97a3e56dd71c7f0c173c172fc8681a74d6e0f3
Merge branch 'master' into next