Merge branch 'master' of git://repo.or.cz/alt-git
commit14e4dfcd785eb20d7b80120cd83892a7201f00fd
authorJohannes Sixt <j6t@kdbg.org>
Mon, 1 Feb 2010 06:44:29 +0000 (1 07:44 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Mon, 1 Feb 2010 06:44:29 +0000 (1 07:44 +0100)
tree2f57da9151ccef2642135eee121d15624c65d61a
parentf2cce4c2bc2119d42d35797663b94d56cea236e1
parentc0da5db1e692c2bc74e5cdba67baf8762ac304b4
Merge branch 'master' of git://repo.or.cz/alt-git
gitk-git/gitk
t/t4150-am.sh