From: Diane Trout <diane@ghic.org>
Date: Mon, 21 Oct 2013 20:59:29 +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=d3805853ee6fde6a1f18dde68d5f4c132d28e9bf

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

d3805853ee6fde6a1f18dde68d5f4c132d28e9bf