]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 30 May 2012 15:27:22 +0000 (17:27 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 30 May 2012 15:27:22 +0000 (17:27 +0200)
commit0618ef649ec182ed00f3249e7410b5c7fe780860
treea2a79d20447907086e50f909e8ee8e70e32d26cb
parent1103f94c34ed874294ca493ab16566a70a4bc239
parent807d2288b6fb1001dff585cf74669171558fcf0a
Merge branch 'master' into next