Matt Wozniski 07e20aa706 Merge remote-tracking branch 'phil' into include-guard-fixes ...

Conflicts:
	single_include/catch.hpp

2012-09-26 21:42:44 -04:00

..

catch.hpp

Merge remote-tracking branch 'phil' into include-guard-fixes

2012-09-26 21:42:44 -04:00