]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Sep 2011 23:40:42 +0000 (00:40 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 17 Sep 2011 23:40:42 +0000 (00:40 +0100)
commit0bc44ffc37401fadbe0a2deb08fea2bd7174d6e7
tree32cd64396eb6d21d27d398618b28056395ddd465
parentb4ab4703c9927f88a0ead3c0aa9df2a3155dc917
parentb9053c6f8ffec037d510519d516eb10d9765190e
Merge branch 'master' into next