Merge remote-tracking branch 'origin/master'

author Sarah Westcott <mothur.westcott@gmail.com>

Thu, 17 Oct 2013 18:20:45 +0000 (14:20 -0400)

committer Sarah Westcott <mothur.westcott@gmail.com>

Thu, 17 Oct 2013 18:20:45 +0000 (14:20 -0400)
author Sarah Westcott <mothur.westcott@gmail.com>
Thu, 17 Oct 2013 18:20:45 +0000 (14:20 -0400)
committer Sarah Westcott <mothur.westcott@gmail.com>
Thu, 17 Oct 2013 18:20:45 +0000 (14:20 -0400)
diff --cc getseqscommand.cpp
Simple merge
diff --cc mothurout.h
Simple merge
author	Sarah Westcott <mothur.westcott@gmail.com>
	Thu, 17 Oct 2013 18:20:45 +0000 (14:20 -0400)
committer	Sarah Westcott <mothur.westcott@gmail.com>
	Thu, 17 Oct 2013 18:20:45 +0000 (14:20 -0400)
		1	2
getseqscommand.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
mothurout.h	patch \|	diff1 \|	diff2 \|	blob \| history