resolving merge conflict between svn and git

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

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