tree 9c83148d9315e5ffda7fbeb657bd8a770a6e8ef4
parent e1e5871a550d88fa3a3a7717ce1a69e864d956df
parent 0645bfa74ece70358238cd01415b9a51962878c8
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1429090246 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1429090246 +0200

Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Fix typos in Changelog
  Fix macro name from wrong branch
  Fix bug in pk_parse_key()
  Fixed typos
  Updated Travis CI config for mbedtls project

Conflicts:
	include/mbedtls/ecp.h
	include/polarssl/compat-1.2.h
	include/polarssl/openssl.h
	include/polarssl/platform.h
	library/pkparse.c
	programs/pkey/mpi_demo.c