merge from git

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowViz@74357 bc3139a8-67e5-0310-9ffc-ced21a209358
update tmp.R
Merge commit '924d8129120ce3fe42a65f2f46801b392e544524' into trunk
close #19
bump version