Merge pull request #17 from johanna-zumer/master

timelock not freq
a

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8063 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
automatically synchronized identical files to revision 8063

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@8064 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'svn'
Merge branch 'master' into svn
bugfix - bug1794 - cfg.sourcunits default now set to 'cm' irrespective.