Ryan Poplin 13591b169f Merge branch 'master' of ssh://gsa2.broadinstitute.org/humgen/gsa-scr1/gsa-engineering/git/unstable		2012-07-30 12:13:24 -04:00
..
src/org/broadinstitute/sting	Merge branch 'master' of ssh://gsa2.broadinstitute.org/humgen/gsa-scr1/gsa-engineering/git/unstable	2012-07-30 12:13:24 -04:00
test/org/broadinstitute/sting/gatk/walkers	Bug fix for the case of merging two VCs when a deletion deletes the padding base for a consecutive indel. Added unit test to cover this case.	2012-07-30 12:09:23 -04:00