enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7788 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@7789 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@7790 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
merge conflict

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7791 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7792 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@7793 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@7794 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
merge conflict

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7795 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge remote-tracking branch 'remotes/origin/master'
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7796 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip
enhancement - started making a test script for bug 1967

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7797 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@7798 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@7799 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@7800 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@7801 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
merge conflict

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