]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:08:23 +0000 (18:08 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 10 Jun 2012 16:08:23 +0000 (18:08 +0200)
commitc008f3f9289292d267aa5bca62c2a8f130c3caf8
treeb413516d5674a97070016674a5daa6cdca6081e7
parenta15fe0e3326a35b0855be6b1e1d2420e9af63ec5
parent6dc69bbd00ce8158b6c2716b6a31ba6cf0583e6a
Merge branch 'master' into next