enhancement - started making a test script for bug 1967
enhancement - extended test script for http://bugzilla.fcdonders.nl/show_bug.cgi?id=1967
enhancement - started making a test script for bug 1967
merge conflict
Merge branch 'master' of github.com:fieldtrip/fieldtrip