From: Diane Trout <diane@ghic.org>
Date: Wed, 11 Jan 2017 00:58:11 +0000 (-0800)
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=8b77a191c722b023ffa8bdd5d3c78823ba2a096e

Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
---

8b77a191c722b023ffa8bdd5d3c78823ba2a096e