enhancement - implemented test script for http://bugzilla.fcdonders.nl/show_bug.cgi?id=2040

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

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7671 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
trying to solve some merge problems between git and svn

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7672 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - removed check for presence of cfg.channel, it will always be present


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