Merge branch 'block-error-warning'
authorDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 11:20:14 +0000 (12:20 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 7 Mar 2012 11:20:14 +0000 (12:20 +0100)
commit3587a6299ce95c9cad15a14bc3c2d109a026d74c
tree933610926d1a3221606ebb4449fe356eaa9635a0
parente6f087568c5d1188b208514169e13e0bcfc310e5
parent7522c8b0bbd2f4dfd17dbd336c19c6bd36f151e2
Merge branch 'block-error-warning'