]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 16 Apr 2015 07:03:28 +0000 (09:03 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 16 Apr 2015 07:03:28 +0000 (09:03 +0200)
commit9d65f595714d31c8ce46f6956b2f502d9efe5225
tree85476f7ce1ba991c260a3bfb5adb10b4bde5873a
parent4958ca00ab362056c0f90bc3a4346715f6dd333e
parentc0dbc5dd77388f79f1ebfe233398b9f44e43fd2a
Merge branch 'master' into next