Merge branch 'master' into django1.4
authorDiane Trout <diane@ghic.org>
Thu, 17 Oct 2013 22:03:43 +0000 (15:03 -0700)
committerDiane Trout <diane@ghic.org>
Thu, 17 Oct 2013 22:03:43 +0000 (15:03 -0700)
commitaa47067f5a80eef8eccd50b3c0f478f79cf0caf8
tree178e7211d1c917098b734575b24663091109d064
parent9c5e5fb4495f21ae6a1fafd98d746aea3b2ad72b
parent10b111edbe6ceb8da7d4296795857060ea831d69
Merge branch 'master' into django1.4
htsworkflow/pipelines/genomemap.py