]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Wed, 16 May 2012 04:24:53 +0000 (06:24 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Wed, 16 May 2012 04:24:53 +0000 (06:24 +0200)
commite969ed502b1d7de7a414fcd1bc1892de35edd6b2
treeb2e03571adcef0b4ec6fc4562e1a28fb6b4242a8
parent85d6c75b947b7085cb50397bbaaf353c7aaad0b1
parent0cce70745115d761e03e920529b318643e3a308f
Merge branch 'master' into next