From: Diane Trout <diane@ghic.org>
Date: Tue, 10 Dec 2013 00:30:05 +0000 (-0800)
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=63bdcf938eb8a421d188287cda4109495b90679d

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

63bdcf938eb8a421d188287cda4109495b90679d