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)
1  2 
htsworkflow/pipelines/genomemap.py

Simple merge