]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Thu, 25 Aug 2011 23:20:18 +0000 (01:20 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Thu, 25 Aug 2011 23:20:18 +0000 (01:20 +0200)
commit6e6eb407e0814744e0d463b04f3f3ebc5b3203fd
tree197411b1a71fdb0256642dc9a2cc13484d0273f2
parent4984b8128209de8bbd5ffb656b02f310f0a07974
parentf86ac3534ed37ffa3f91257c90b63cf689100805
Merge branch 'master' into next