From 5c58aa22ee8792bca232e81d1dc5bbf959aef1b5 Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 15 Apr 2014 22:01:23 +0000
Subject: [PATCH] Bug 996169: Release notes for Bugzilla 4.0.12 r=dkl
 a=justdave

git-svn-id: svn://10.0.0.236/branches/BUGZILLA-4_0-BRANCH@265323 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                           | 2 +-
 mozilla/webtools/bugzilla/.gitrev                           | 2 +-
 .../template/en/default/pages/release-notes.html.tmpl       | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 202df380107..861c2fb075c 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7766
\ No newline at end of file
+7767
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 62ddecc5f36..502aa71b498 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-0d3ff48e2cd37df7ad6ca32c63bb46c2f4b7ce12
\ No newline at end of file
+1293af79ec070c5693fd76238d959f0dabaa8834
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl
index 12f408b013e..7aa73f16d54 100644
--- a/mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/pages/release-notes.html.tmpl
@@ -72,6 +72,12 @@
 
 <h2 id="v40_point">Updates in this 4.0.x Release</h2>
 
+<h3>4.0.12</h3>
+
+<p>This release fixes one minor security issue. See the
+  <a href="http://www.bugzilla.org/security/4.0.11/">Security Advisory</a>
+  for details.</p>
+
 <h3>4.0.11</h3>
 
 <p>This release fixes two security issues. See the