From: Diane Trout <diane@caltech.edu>
Date: Thu, 17 Oct 2013 21:17:52 +0000 (-0700)
Subject: Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=56496d64f35a92c64f270ad20387cebc80d2e170

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

56496d64f35a92c64f270ad20387cebc80d2e170