From: Diane Trout Date: Thu, 13 Dec 2012 18:21:36 +0000 (-0800) Subject: Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow into django1.4 X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=a6e26eb1c6c1c34108c0d9df64ae38d57f5b1b12 Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow into django1.4 --- a6e26eb1c6c1c34108c0d9df64ae38d57f5b1b12