From: Diane Trout <diane@caltech.edu>
Date: Tue, 10 Dec 2013 00:13:48 +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=a130abd37e306fea5208c1172ebfd3e69acb2b7b

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

a130abd37e306fea5208c1172ebfd3e69acb2b7b