]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 22 Nov 2011 22:08:43 +0000 (22:08 +0000)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 22 Nov 2011 22:08:43 +0000 (22:08 +0000)
commitf7f1ec5dab85e934de8220fb48dee861e1097e35
tree505dda9d452b67db25c25a11215a373e6a741c91
parentacf29dbfd55ac006b83b8cea7095740108b977ec
parente09bb51c14c3b024b6515007482e752cdd6ce4b6
Merge branch 'master' into next