From: Diane Trout <diane@caltech.edu>
Date: Sat, 18 Jun 2011 20:31:03 +0000 (-0700)
Subject: Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
X-Git-Tag: 0.5.2~15
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=1011742ef95a437d53e4cea23b63e21c62c06a32

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

1011742ef95a437d53e4cea23b63e21c62c06a32