merge from git

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