]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 18:07:29 +0000 (20:07 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 28 Aug 2011 18:07:29 +0000 (20:07 +0200)
commitabafb2b235102ea561c632391ad525f7e1c9e148
tree470828c59f274c63fda6f242a27137e24ae23bfb
parent44ae1b50ef7d32afc4b54817ebddb62b3c726b8a
parent0b2e974893e61a07348eeefbc8089e60386b949e
Merge branch 'master' into next