Merge branch 'master' into local-hedgehog

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/rols@73576 bc3139a8-67e5-0310-9ffc-ced21a209358
results='verbatim' instead of results='asis'

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/rols@74365 bc3139a8-67e5-0310-9ffc-ced21a209358
revert last change, my bad

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/rols@74366 bc3139a8-67e5-0310-9ffc-ced21a209358
bump y of x.y.z version number for BioC 2.12 release

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/rols@75263 bc3139a8-67e5-0310-9ffc-ced21a209358
Bump y in version x.y.z to odd number in devel

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/rols@75270 bc3139a8-67e5-0310-9ffc-ced21a209358
bioc version bumps