]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Dec 2012 20:42:33 +0000 (21:42 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 14 Dec 2012 20:42:33 +0000 (21:42 +0100)
commita0228b0333376fa947e9186d877b994c18f3d1e1
tree4a43129c794e90ada380e402f6762706f243ce66
parentff4950a1bbba27182c875e869b98acaa4f404c57
parentf91e6fb73f45cbe39721fd3dda7d209f3db77edb
Merge branch 'master' into next