Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@ghic.org>
Thu, 5 Dec 2013 23:28:36 +0000 (15:28 -0800)
committerDiane Trout <diane@ghic.org>
Thu, 5 Dec 2013 23:28:36 +0000 (15:28 -0800)
commitf7abcc50636dc384cb23fff66e0e618f39b879a0
tree7b43596fdcce159721f1a9dc71e8d857d9cbb983
parentb352bcebfc6c74f84d65a05c8cdbfb55d94d029c
parent86dc57e6227c79cd3f599e3d8bac46a44f961607
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4