Merge remote-tracking branch 'origin'

author SarahsWork <sarahswork@imac.westcotts.net>

Tue, 5 Mar 2013 19:15:10 +0000 (14:15 -0500)

committer SarahsWork <sarahswork@imac.westcotts.net>

Tue, 5 Mar 2013 19:15:10 +0000 (14:15 -0500)
author SarahsWork <sarahswork@imac.westcotts.net>
Tue, 5 Mar 2013 19:15:10 +0000 (14:15 -0500)
committer SarahsWork <sarahswork@imac.westcotts.net>
Tue, 5 Mar 2013 19:15:10 +0000 (14:15 -0500)
diff --cc seqerrorcommand.cpp
Simple merge
diff --cc trimflowscommand.cpp
Simple merge
author	SarahsWork <sarahswork@imac.westcotts.net>
	Tue, 5 Mar 2013 19:15:10 +0000 (14:15 -0500)
committer	SarahsWork <sarahswork@imac.westcotts.net>
	Tue, 5 Mar 2013 19:15:10 +0000 (14:15 -0500)
		1	2
seqerrorcommand.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
trimflowscommand.cpp	patch \|	diff1 \|	diff2 \|	blob \| history