From f78bebbb928e16d3e5f7c9652d655b5503851b20 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Mon, 19 Jan 2015 20:35:10 +0000
Subject: [PATCH] Bug 1118985: Release notes for 4.2.12 r=LpSolit,a=glob

---
 .../en/default/pages/release-notes.html.tmpl     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 690d334ae9..2e653c6169 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -53,6 +53,22 @@
 
 <h2 id="v42_point">Updates in this 4.2.x Release</h2>
 
+<h3>4.2.12</h3>
+
+<p>This release fixes a couple of security issues. See the
+  <a href="https://www.bugzilla.org/security/4.0.15/">Security Advisory</a>
+    for details.</p>
+
+<p>In addition, the following important fix has been made in this release:</p> 
+
+<ul>
+  <li>Fixing a regression caused by CVE-2014-1571
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1064140">[% terms.bug %] 1064140</a>),
+    comments made while setting a flag from the attachment details page are again
+    included in the flag notification email.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1082887">[% terms.Bug %] 1082887</a>)</li>
+</ul>
+
 <h3>4.2.11</h3>
 
 <p>This release fixes several security issues. See the
-- 
2.47.2