tree 2846cb85cf1decee9172aca5d63ed86d621ad93e
parent 799ecf96040d8c4c79972d45ab23df078a9ace68
parent 1840929c51409724d5787029322f40307f714c60
author Phil Nash <github@philnash.me> 1348472401 +0100
committer Phil Nash <github@philnash.me> 1348472401 +0100

Merge branch 'master' of github.com:philsquared/Catch

Conflicts:
	single_include/catch.hpp