merge from github

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/flowWorkspace@86061 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit '0f80cad95752c03f681714730f71def57a8dbd7b'
Merge commit '0f80cad95752c03f681714730f71def57a8dbd7b' into trunk
bump versions
Merge commit 'd519fb451382f934b1e2784a81c05fd57164df7e' into trunk
Merge branch 'master' of github.com:RGLab/flowWorkspace