]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 26 Nov 2011 22:25:06 +0000 (22:25 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 26 Nov 2011 22:25:06 +0000 (22:25 +0000)
commit1a3b82eb02cc2da1078e73db24df10b89bf99260
tree9f673c32fc287c06cf0dc57868e0f4c2f5fc8f20
parentf5dce848b83cd8fbe5e9d0905acc058924bf2101
parent3c1c67e3f1732435bb99aab7bd46576afe4221ef
Merge branch 'master' into next