Merge branch 't/extra-actions/log-consolidate' into refs/top-bases/master
commitc7d0ae5396f189809adbfb272d08305a04b52d9d
authorPetr Baudis <pasky@ucw.cz>
Mon, 2 Nov 2009 23:41:09 +0000 (3 00:41 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Mon, 2 Nov 2009 23:41:09 +0000 (3 00:41 +0100)
tree411e9316c1fd16957115f27c7421f67c0e3d835b
parent09064dbdd14a7808700cbc994e81dd7f70c31d77
parent61498c55da86d79c5d52b11a0201d5cff12459ab
Merge branch 't/extra-actions/log-consolidate' into refs/top-bases/master