From 6e51c6d19612d03abc81b86bb70b8d7da678ce5d Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 21 Jun 2016 15:12:41 +0200
Subject: Prepare release

---
 lib/public_key/doc/src/notes.xml | 28 ++++++++++++++++++++++++++++
 lib/public_key/vsn.mk            |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'lib/public_key')

diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 49b2ba0326..c4d930c01f 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,34 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The ASN-1 type GeneralName can have more values, then the
+	    most common directory name, the code now handles this.</p>
+          <p>
+	    Own Id: OTP-13554</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Handle PEM encoded EC public keys</p>
+          <p>
+	    Own Id: OTP-13408</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 1.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index f801f55073..84f6a659b5 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.1.1
+PUBLIC_KEY_VSN = 1.2
-- 
cgit v1.2.3