merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/flowWorkspace@86683 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit '2b058c5296f3d9bfcbda752a18efd89ec9d998cc'
fix a typo
Merge branch 'master' of github.com:RGLab/flowWorkspace
Merge branch 'trunk'