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

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

b7afc206f8490217ca920515674bcedc8aae184c