enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7823 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - extended test script for http://bugzilla.fcdonders.nl/show_bug.cgi?id=1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7824 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7825 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - extended test script for http://bugzilla.fcdonders.nl/show_bug.cgi?id=1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7826 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7827 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
merge conflict

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7828 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
resolved merge conflict between svn and github, the only way was to allow the conflict to affect the file for some commits. This commit reverts the file back to the desired state.

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7829 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip

Conflicts:
	test/test_bug1967.m