From: Diane Trout Date: Thu, 5 Dec 2013 23:28:36 +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=f7abcc50636dc384cb23fff66e0e618f39b879a0 Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4 --- f7abcc50636dc384cb23fff66e0e618f39b879a0