Merge branch 'masai_fseq' into rnaseq
Merge branch 'masai_fseq' into rnaseq
Merge branch 'masai_fseq' into rnaseq
smokebox
Merge branch 'rnaseq' of github.com:clark-lab/ngsane into rnaseq
Changed permissions 775.
Merge branch 'masai_fseq' into rnaseq
Merge branch 'masai_fseq' into rnaseq
Merge branch 'masai_fseq' into rnaseq

Conflicts:
	bin/trigger.sh
	mods/cufflinks.sh
	mods/cuffnorm.sh
	mods/cuffquant.sh
Merge branch 'rnaseq' into masai_fseq