]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 11 Jul 2014 07:51:28 +0000 (09:51 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 11 Jul 2014 07:51:28 +0000 (09:51 +0200)
commitc937f768f92b74dfa662b174cf6e6fc6f4871234
treea241e9cdd3928d4169aacd3a957948f8f4dfeac5
parent6bf7f8ef78f165504ff39f8767e7e11b3fbd8e84
parentf96ec19df0a30c492d68bb402bf741763332677c
Merge branch 'master' into next