Changed my-subproject from parent
Changes from parent and my-subproject
Merge pull request #1 from strahlex/vinny-some-awesome-work

Vinny some awesome work
A good change
Merge commit '5c366a959c0f7513175a022c5d6434ce3500067f'

Conflicts:
	vendor/mylib2