From: Diane Trout Date: Tue, 20 Oct 2015 23:17:47 +0000 (-0700) Subject: Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7 X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=696fc9eb581640c7d04c00a354cab77a77e6c092 Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7 --- 696fc9eb581640c7d04c00a354cab77a77e6c092