tree 99f4142546a0e81d882e134ed59bc310faca6edf
parent a0f07478ee59f4e532bade0fbe221dd37d458694
parent 70064fd72151cf1b6511b39b225d075403917b11
author Paul Bakker <p.j.bakker@polarssl.org> 1377683840 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> 1377683920 +0200

Merged ECDSA-based key-exchange and ciphersuites into development

Conflicts:
	include/polarssl/config.h
	library/ssl_cli.c
	library/ssl_srv.c
	library/ssl_tls.c