automatically synchronized identical files to revision 7839

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7840 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
removed comflicting file

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7841 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement/bugfix1965: all specest functions now give warnings when
there is a mismatch between input and output freqoi/timeoii (not a
warning_once)

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