From: Diane Trout <diane@caltech.edu>
Date: Thu, 5 Dec 2013 23:06:14 +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=86dc57e6227c79cd3f599e3d8bac46a44f961607

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

86dc57e6227c79cd3f599e3d8bac46a44f961607