]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 24 Dec 2012 13:50:15 +0000 (14:50 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 24 Dec 2012 13:50:15 +0000 (14:50 +0100)
commit1a6bddad55b87f6d1e23ab05c1abc4da1e843a21
tree018f25ed87e778982f7d1d4a633c24eda95d5d99
parent24aa857a89876474bac5209428abb389bc1a9a75
parente67ff4dd1c23edd0517af68aa7d4ebff09909060
Merge branch 'master' into next