Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@caltech.edu>
Tue, 8 Jan 2013 01:51:28 +0000 (17:51 -0800)
committerDiane Trout <diane@caltech.edu>
Tue, 8 Jan 2013 01:51:28 +0000 (17:51 -0800)
commita1d3a0155a6cb8eb31cf6ff7dce3fe0cc6b79dbc
tree8ebe158fcda4a21b9bb6fd76c26f34d2d429b5e3
parent3ecb135bc504bc9323951cec6c99f1c256b067b1
parent0756aa9f6ce3f3c0ff459b9eee119414f64c94f8
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