]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 23:04:28 +0000 (01:04 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 4 Aug 2011 23:04:28 +0000 (01:04 +0200)
commit2631ad4c07e4fc3bb4b45c8be0947071c7ac7fa9
treef12a47757923f0110da5ecd9757bdadd5641257c
parent6e95004d6cb2e6dd2f342cef4c51b1d2fc8de3f9
parent863b3898a622c0cefeb9dfededc6c1d94930abcc
Merge branch 'master' into next