merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/ncdfFlow@83556 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge commit '7b1c7deff021602f04dcb2085f64d7d7e65b7737' into trunk
RGLab/flowViz#16
Merge branch 'trunk' of github.com:RGLab/ncdfFlow into trunk