From: Diane Trout Date: Tue, 8 Jan 2013 01:51:28 +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=a1d3a0155a6cb8eb31cf6ff7dce3fe0cc6b79dbc Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4 I fixed one of the time-stamp formats on both development machines. Conflicts: htsworkflow/pipelines/gerald.py --- a1d3a0155a6cb8eb31cf6ff7dce3fe0cc6b79dbc