]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Dec 2012 20:13:12 +0000 (21:13 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 19 Dec 2012 20:13:12 +0000 (21:13 +0100)
commit895f8e05c8d933b15d3f267e1e581cff8caf6a5c
treef4f214c5c9b3a9e50470c0510a19053c1d3142f7
parent4baf944ef0d930bde3493767b1d3e9e5abf4731b
parent52ea8ee720ee19e7180135d0c50307a84241d28c
Merge branch 'master' into next