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

Commit information:

    Commit id: e0249b7b75faf594282b13c5374d7aa3143ab8be
    Commit message:
    merge from bioc-devel

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

    Commit id: 8e208ee2d379db151acd58de52b7d71e5a50ded9
    Commit message:
    Merge commit 'e0249b7b75faf594282b13c5374d7aa3143ab8be'
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-10T16:18:47-08:00

    Commit id: 6c228fce3731a354b8a76687e29fc27916953e29
    Commit message:
    fix another typo. #138
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-10T16:36:41-08:00

    Commit id: db221de3e89737aa414abd701578638b644df5f9
    Commit message:
    Merge branch 'master' of github.com:RGLab/flowWorkspace
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-10T16:37:06-08:00

    Commit id: 384eca623fdce4b0118924f02cbc0b8f3567cbf8
    Commit message:
    Merge branch 'trunk'
    Committed by mikejiang <wjiang2 at fhcrc.org>
    Commit date: 2014-02-10T16:37:16-08:00

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

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