From: Diane Trout <diane@caltech.edu>
Date: Thu, 30 Jun 2011 21:45:05 +0000 (-0700)
Subject: Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
X-Git-Tag: 0.5.2~5^2~2
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=cb31e85879d6be5b9ddbc843c5b4390080bfb61b

Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
---

cb31e85879d6be5b9ddbc843c5b4390080bfb61b