Merge branch 'master' into block-error-warning
authorDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 09:59:43 +0000 (10:59 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 09:59:43 +0000 (10:59 +0100)
commit7522c8b0bbd2f4dfd17dbd336c19c6bd36f151e2
tree88e0a41416635f51876fd3f2ba304476dd82cda4
parent9faf31eb76514551c9fee3462fffd295f702f87d
parentaea98cc62cdc735d9d592919bd6d906c269f072a
Merge branch 'master' into block-error-warning

Fix conflicts:
test/test_termlist_block_10.res
test/test_termlist_block_5.res