]> git.sur5r.net Git - i3/i3/commit
Merge branch 'master' of zekjur:/git/i3
authorMichael Stapelberg <michael+git@stapelberg.de>
Sun, 22 Feb 2009 23:18:48 +0000 (00:18 +0100)
committerMichael Stapelberg <michael+git@stapelberg.de>
Sun, 22 Feb 2009 23:18:48 +0000 (00:18 +0100)
commit4ba6ddb41cec60809caf8ad25b0f48f19e7fea28
treeb8065222f82bab8e8f6b96f3083ac30d7a418287
parent1a0817eb3912f25b75cfe61854920c52c78493d2
parenteca5d12b821ad3ab4ce0b6a9ebfeb24f3aa76e1a
Merge branch 'master' of zekjur:/git/i3