ENH: added labjack U3 support to the ParallelPort Component
Merge pull request #643 from hsogo/master

FF: Avoid calling Freeze() and Thaw() on Win32
Merge branch 'master' of github.com:psychopy/psychopy
DOCS: version number bumped