Merge branch 'maint'

* maint:
  Updated OTP version
  Prepare release

# Conflicts:
#	OTP_VERSION
#	make/otp_version_tickets_in_merge

3 files changed, 20 insertions, 1 deletions

diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index f4e45ad3ec..ddc115c98c 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,24 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 5.0.11</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The compiler now has limited support for the JSON
+	    encoding rules (ITU-T X.697 ASN.1 encoding rules:
+	    Specification of JavaScript Object Notation Encoding
+	    Rules).</p>
+          <p>
+	    Own Id: OTP-16030</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 5.0.10</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 901c40d53f..e1d3b65da2 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.10
+ASN1_VSN = 5.0.11
diff --git a/otp_versions.table b/otp_versions.table
index 8adde5e998..212aa72141 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-22.3.2 : asn1-5.0.11 # common_test-1.18.2 compiler-7.5.4 crypto-4.6.5 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.3 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.2 erts-10.7.1 et-1.6.4 eunit-2.4.1 ftp-1.0.4 hipe-3.19.3 inets-7.1.3 jinterface-1.10.1 kernel-6.5.2 megaco-3.18.8 mnesia-4.16.3 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.2 reltool-0.8 runtime_tools-1.14 sasl-3.4.2 snmp-5.5 ssh-4.9 ssl-9.6.1 stdlib-3.12.1 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3.1 wx-1.9 xmerl-1.3.24 :
 OTP-22.3.1 : compiler-7.5.4 erts-10.7.1 inets-7.1.3 ssl-9.6.1 stdlib-3.12.1 xmerl-1.3.24 # asn1-5.0.10 common_test-1.18.2 crypto-4.6.5 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.3 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.2 et-1.6.4 eunit-2.4.1 ftp-1.0.4 hipe-3.19.3 jinterface-1.10.1 kernel-6.5.2 megaco-3.18.8 mnesia-4.16.3 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.2 reltool-0.8 runtime_tools-1.14 sasl-3.4.2 snmp-5.5 ssh-4.9 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3.1 wx-1.9 :
 OTP-22.3 : asn1-5.0.10 common_test-1.18.2 compiler-7.5.3 crypto-4.6.5 diameter-2.2.3 erl_interface-3.13.2 erts-10.7 eunit-2.4.1 hipe-3.19.3 kernel-6.5.2 megaco-3.18.8 mnesia-4.16.3 public_key-1.7.2 sasl-3.4.2 snmp-5.5 ssh-4.9 ssl-9.6 stdlib-3.12 tools-3.3.1 # debugger-4.2.8 dialyzer-4.1.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 et-1.6.4 ftp-1.0.4 inets-7.1.2 jinterface-1.10.1 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 reltool-0.8 runtime_tools-1.14 syntax_tools-2.2.1 tftp-1.0.2 wx-1.9 xmerl-1.3.23 :
 OTP-22.2.8 : diameter-2.2.2 # asn1-5.0.9 common_test-1.18.1 compiler-7.5.2 crypto-4.6.4 debugger-4.2.8 dialyzer-4.1.1 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.1 erts-10.6.4 et-1.6.4 eunit-2.4 ftp-1.0.4 hipe-3.19.2 inets-7.1.2 jinterface-1.10.1 kernel-6.5.1 megaco-3.18.7 mnesia-4.16.2 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1 parsetools-2.1.8 public_key-1.7.1 reltool-0.8 runtime_tools-1.14 sasl-3.4.1 snmp-5.4.5 ssh-4.8.2 ssl-9.5.3 stdlib-3.11.2 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3 wx-1.9 xmerl-1.3.23 :