Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@caltech.edu>
Thu, 17 Oct 2013 21:17:52 +0000 (14:17 -0700)
committerDiane Trout <diane@caltech.edu>
Thu, 17 Oct 2013 21:17:52 +0000 (14:17 -0700)
commit56496d64f35a92c64f270ad20387cebc80d2e170
tree25b347aaeb0b8f4450ff2af97eba32076c4e5d6b
parent5cd0308e3ea6aff59ae5cbdb2a9569ffff56984a
parent9c5e5fb4495f21ae6a1fafd98d746aea3b2ad72b
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4