resources/info.txt
Merge branch 'flavio' of github.com:flavio-fernandes/docker-ovs into flavio

Conflicts:
	resources/info.txt