Merge remote-tracking branch 'origin'

author SarahsWork <sarahswork@141-213-168-227.vpn.umnet.umich.edu>

Mon, 18 Mar 2013 17:37:37 +0000 (13:37 -0400)

committer SarahsWork <sarahswork@141-213-168-227.vpn.umnet.umich.edu>

Mon, 18 Mar 2013 17:37:37 +0000 (13:37 -0400)
author SarahsWork <sarahswork@141-213-168-227.vpn.umnet.umich.edu>
Mon, 18 Mar 2013 17:37:37 +0000 (13:37 -0400)
committer SarahsWork <sarahswork@141-213-168-227.vpn.umnet.umich.edu>
Mon, 18 Mar 2013 17:37:37 +0000 (13:37 -0400)
diff --cc makecontigscommand.cpp
Simple merge
diff --cc seqerrorcommand.cpp
Simple merge
diff --cc trimseqscommand.cpp
Simple merge
author	SarahsWork <sarahswork@141-213-168-227.vpn.umnet.umich.edu>
	Mon, 18 Mar 2013 17:37:37 +0000 (13:37 -0400)
committer	SarahsWork <sarahswork@141-213-168-227.vpn.umnet.umich.edu>
	Mon, 18 Mar 2013 17:37:37 +0000 (13:37 -0400)
		1	2
makecontigscommand.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
seqerrorcommand.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
trimseqscommand.cpp	patch \|	diff1 \|	diff2 \|	blob \| history