From: Diane Trout <diane@caltech.edu>
Date: Mon, 1 Jul 2013 23:02:46 +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=6f05ae54b482745afbacc8da7d9cc31f9b067d23

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

6f05ae54b482745afbacc8da7d9cc31f9b067d23