Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@ghic.org>
Mon, 21 Oct 2013 20:59:29 +0000 (13:59 -0700)
committerDiane Trout <diane@ghic.org>
Mon, 21 Oct 2013 20:59:29 +0000 (13:59 -0700)
commitd3805853ee6fde6a1f18dde68d5f4c132d28e9bf
treef3f734ddb23c8bfc322cffd8566eb84566e6d1ec
parentaa47067f5a80eef8eccd50b3c0f478f79cf0caf8
parentbae7b6db07157684a99a583a13ce776f86bbb074
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4