]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 27 Aug 2013 18:23:00 +0000 (20:23 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 27 Aug 2013 18:23:00 +0000 (20:23 +0200)
commit1a7fe4ee79dd707d33832c672c8e1c5a5619b983
tree436a56e0baa5e15fae0d1a3cc70f1ad8b39bacf8
parent28fafcb1c278f30c215328e044ab60cbfddb1327
parentbbc30cf1426f1a62194b2873545263e32276d850
Merge branch 'master' into next