Christopher Hartl 5d706c9e92 Merge branch 'master' of ssh://chartl@tin.broadinstitute.org/humgen/gsa-scr1/gsa-engineering/git/unstable ... Removing PSP and CSM Conflicts: public/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/CreateSequenomMask.java public/java/src/org/broadinstitute/sting/gatk/walkers/sequenom/PickSequenomProbes.java		2011-07-19 20:25:33 -04:00
..
broadinstitute/sting	Merge branch 'master' of ssh://chartl@tin.broadinstitute.org/humgen/gsa-scr1/gsa-engineering/git/unstable	2011-07-19 20:25:33 -04:00