]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Mon, 28 May 2012 21:37:26 +0000 (23:37 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Mon, 28 May 2012 21:37:26 +0000 (23:37 +0200)
commit1103f94c34ed874294ca493ab16566a70a4bc239
tree0a0777c0d09068cebc140dd030559279dff29f3b
parentd154d347ece8984d79597025c88dcc25f1eded1c
parent24b1fcfd1a77520afbaf3b65b36174e821ac5589
Merge branch 'master' into next