ext added a file
ext changed a file
Merge branch 'master' of test_subtree_external

Conflicts:
	external/blafoo.h