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

Commit information:

    Commit id: 2b058c5296f3d9bfcbda752a18efd89ec9d998cc
    Commit message:
    merge from git

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

    Commit id: 270e65606b7452bd4c7a57091ca45436621c37de
    Commit message:
    Merge commit '2b058c5296f3d9bfcbda752a18efd89ec9d998cc'
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-21T15:16:43-08:00

    Commit id: b55d81c7249e86024d56b5514325780bec5c6063
    Commit message:
    fix a typo
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-21T15:32:40-08:00

    Commit id: d4c0507e9f64b01d96c5ceb76cd44affa0bd30d3
    Commit message:
    Merge branch 'master' of github.com:RGLab/flowWorkspace
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-21T15:33:04-08:00

    Commit id: e4bbcd265df92e4d4a2fa0cef245cdac06b95299
    Commit message:
    Merge branch 'trunk'
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-21T15:33:08-08:00

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

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