]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' into next
authorMichael Stapelberg <michael@stapelberg.de>
Tue, 28 May 2013 17:56:57 +0000 (19:56 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Tue, 28 May 2013 17:56:57 +0000 (19:56 +0200)
commit8353a387c99cb2d5b90bbc83bb3b41fb2a0895a1
tree061611ac328376bc49ee7fd1bd1214cdfdd14676
parente979f16ddb1374a1dd194303693eb00dc37c7da3
parentaa8d9214a6101bc2711d295619827cc14d7ab245
Merge branch 'master' into next