tree 1ac12c4e15329ce7c1dc4ce6d315f264cc7fc511
parent 4c55ec9011730941a9449811953c518b54bfda0d
parent 9699996f46749138e41f947047a11964377d5abe
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1424191845 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1424191845 +0000

Merge branch 'mbedtls-1.4' into dtls

* mbedtls-1.4:
  Add missing require_gnutls guards in ssl-opt.sh
  Remove gnutls from the travis build
  Update release date and added note