From: Diane Trout Date: Mon, 21 Oct 2013 21:53:56 +0000 (-0700) Subject: Merge remote-tracking branch 'brisby/django1.4' into django1.4 X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=b352bcebfc6c74f84d65a05c8cdbfb55d94d029c Merge remote-tracking branch 'brisby/django1.4' into django1.4 --- b352bcebfc6c74f84d65a05c8cdbfb55d94d029c