]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 16:15:10 +0000 (18:15 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Sun, 7 Aug 2011 16:15:10 +0000 (18:15 +0200)
commit8b9ba5fd0ba351a26e2bf552dd5e55a9d9ca3b74
tree59ef8cdc013a18c3561ce0285821ea00690e5e53
parent091b72f3a904a9d26b679b6a475f84cbdfdd6c2c
parentb0f0a045bca72e72a8fd5f6f4d4cb6e538b5abee
Merge branch 'master' into next