Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Fri, 19 Sep 2008 21:52:26 +0000 (22:52 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 19 Sep 2008 21:52:26 +0000 (22:52 +0100)
commit3ce5fec2ef4154369653a41eb7692aca25878298
tree214c312133434b1a87b89ba72807b5b9f0f2cd01
parent199bfcd3ace43faa91ec97b1c16cb994b1dcfbb9
parent8bcdcdc99a819905d837ad90dd02aa3611c3144e
Merge branch 'stable'

Conflicts:

t/t1501-sink.sh
t/t1501-sink.sh