Commit made by the Bioconductor Git-SVN bridge.
Consists of 5 commit(s).

Commit information:

    Commit id: 744d4a8e8d6325b8b1259b37332c003e663210e2
    Commit message:
    merge from git

    git-svn-id: https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/flowWorkspace@86692 bc3139a8-67e5-0310-9ffc-ced21a209358
    Committed by m.jiang <m.jiang at bc3139a8-67e5-0310-9ffc-ced21a209358>
    Commit date: 2014-02-21T15:17:33-08:00

    Commit id: 1e1e8c13725c5fe0a60e68db7ed2502d3d09616f
    Commit message:
    Merge commit '744d4a8e8d6325b8b1259b37332c003e663210e2'
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-21T15:34:01-08:00

    Commit id: 0eb6f485ee6cc4b08a1417b7e8ae534d9d69dc8f
    Commit message:
    fix vignette
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-21T16:46:14-08:00

    Commit id: cef4a03c733280a178b7de85e0fca5ddebacbcc2
    Commit message:
    Merge branch 'master' of github.com:RGLab/flowWorkspace
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-21T16:50:28-08:00

    Commit id: fb2b3d068540a47e56200b4ff5bb582e7f6427bc
    Commit message:
    Merge branch 'trunk'
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-21T16:50:31-08:00

From: Bioconductor Git-SVN Bridge <bioc-sync@bioconductor.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/flowWorkspace@86699 bc3139a8-67e5-0310-9ffc-ced21a209358