From 32e843f7619556c7aea2374afa6c9c1ca2eca2ff Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 5 Oct 2014 16:45:46 +0000
Subject: [PATCH] Bug 1071276: Markdown comment checkbox value is not passed
 through properly when a mid air collision has occurred and user chooses to
 submit comment r=dkl a=sgreen

git-svn-id: svn://10.0.0.236/trunk@265598 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                               | 2 +-
 mozilla/webtools/bugzilla/.gitrev                               | 2 +-
 .../bugzilla/template/en/default/bug/process/midair.html.tmpl   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 52b51924c6a..9ad05f64501 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9158
\ No newline at end of file
+9159
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index becc1fe6255..9988b7612c0 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-d33c399b231a1d47a3fb94a770256369dbb32e6a
\ No newline at end of file
+553568ddf8d9c6282daf779bb83dec7111ed4ff0
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
index 17025fee741..f89590df2d6 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/process/midair.html.tmpl
@@ -76,6 +76,7 @@ You have the following choices:
         <input type="hidden" name="id" value="[% cgi.param("id") FILTER html %]">
         <input type="hidden" name="delta_ts" value="[% bug.delta_ts FILTER html %]">
         <input type="hidden" name="comment" value="[% cgi.param("comment") FILTER html %]">
+        <input type="hidden" name="use_markdown" value="[% cgi.param("use_markdown") FILTER html %]">
         <input type="hidden" name="comment_is_private"
                value="[% cgi.param("comment_is_private") FILTER html %]">
         <input type="hidden" name="token" value="[% cgi.param("token") FILTER html %]">