Merge branch 'master' of github.com:fieldtrip/fieldtrip
enhancement - compute timelock.var also if some elements of dof>1, see http://bugzilla.fcdonders.nl/show_bug.cgi?id=2061 (thanks to Joscha)
Merge branch 'master' of github.com:oostenveld/fieldtrip
enhancement - compute timelock.var also if some elements of dof>1, see http://bugzilla.fcdonders.nl/show_bug.cgi?id=2061 (thanks to Joscha)

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7682 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
enhancement - compute timelock.var also if some elements of dof>1, see http://bugzilla.fcdonders.nl/show_bug.cgi?id=2061 (thanks to Joscha)

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7682 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip
enhancement - instead of giving an error, give a warning when non-unique channels are present and discard them. See also #2062
enhancement - improved channel handling in case of config object, see #2061
bugfix - read lay variable from mat file and rename to layout, see #2061
enhancement - read the test data from the correct location, see #2061
enhancement - always add external/signal, see #2033 and #2061
Merge branch 'master' of github.com:oostenveld/fieldtrip
Merge branch 'master' of github.com:fieldtrip/fieldtrip
Merge branch 'master' of github.com:oostenveld/fieldtrip

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

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7683 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip
bugfix - test_bug840 revealed that the recently included external/signal/bilinear.m behaves different from the matlab version. Moved bilinear to signal/private.
Merge branch 'hotfix' of github.com:oostenveld/fieldtrip

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

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