tree 4e3654a3b9ef1501cd9695f2f8e12476054f934e
parent 92c1f41e388fe9e299acda204c2b544a65b84939
parent a6c5ea2c438ad52aa4f5b6da14154e07d18628da
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1415199777 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1415199777 +0100

Merge branch 'development' into dtls

* development:
  Include 1.2.12 release information in ChangeLog