]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' of zekjur:/git/i3
authorMichael Stapelberg <michael+git@stapelberg.de>
Wed, 25 Feb 2009 00:44:59 +0000 (01:44 +0100)
committerMichael Stapelberg <michael+git@stapelberg.de>
Wed, 25 Feb 2009 00:44:59 +0000 (01:44 +0100)
commit7333f16aca6e951d85469fbd2fdee81ce92b0ac6
treefc1343bc3fbc511303735506f591bd0faa78a4c9
parent90fa720c6ff7a9ea2dca78eb553e09b5f9553e51
parent94bbe02e7be8f1246402f17df92f02e3d0489023
Merge branch 'master' of zekjur:/git/i3