]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 01:24:14 +0000 (03:24 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 26 Aug 2011 01:24:14 +0000 (03:24 +0200)
commit53a9ace3a6e44213dc5b390df02de8be3d5d16de
tree44d0a0722f72608c15a4dc7818bd3b95da3e55cf
parenta57a2b9ccb85cd5045c862901f775603ba5cff00
parented6f5d214c3395ad5e55f003fb06c6b69f18bb9a
Merge branch 'master' into next