Merge commit 'vanilla/master' into refs/top-bases/t/extra-actions/log-consolidatet/extra-actions/log-consolidate
authorPetr Baudis <pasky@ucw.cz>
Mon, 2 Nov 2009 23:40:56 +0000 (00:40 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Mon, 2 Nov 2009 23:40:56 +0000 (00:40 +0100)
commitfd445320f8549f71172db367e70eb6f643fd4988
tree2af8174d58a9909018f126e79fb69f15243c93a3
parent590e56d2279429532b989f972aa05fd9ae37979a
parent8cc62c1677c99c5e204d2b51269b47b7557a79e0
Merge commit 'vanilla/master' into refs/top-bases/t/extra-actions/log-consolidate