From: Diane Trout <diane@caltech.edu>
Date: Wed, 16 May 2012 16:49:53 +0000 (-0700)
Subject: Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
X-Git-Tag: v0.5.5~25
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=f8f5ec437bd2ce968d07b98125383618adaa83c9

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

f8f5ec437bd2ce968d07b98125383618adaa83c9