tree b86e3a8545c8885000a1da864b40f744638bd543
parent df81924a7a968caccf26484be0955298a1b15465
parent 38db006e0c226813f11db68702751e5dea9a5ee4
author Simon Butcher <simon.butcher@arm.com> 1440012571 +0100
committer Simon Butcher <simon.butcher@arm.com> 1440012571 +0100

Merge branch 'development' of ssh://github.com/ARMmbed/mbedtls into development

Conflicts:
	yotta/data/example-authcrypt/README.md
	yotta/data/example-benchmark/README.md
	yotta/data/example-hashing/README.md
	yotta/data/example-selftest/README.md
	yotta/data/example-tls-client/README.md