From 274214829c86ea977236c8b434601cdbe9fa1d02 Mon Sep 17 00:00:00 2001
From: toady <support@8pecxstudios.com>
Date: Thu, 13 Aug 2015 12:51:57 +1000
Subject: [PATCH] Merge: cyberfox 40.0.2 with cyberfox 40.0.1

We already merged Bug 1160295 as we were shipping it in 40.0.1 but looks
like mozilla scraped 40.0.1 and landed the patch in 40.0.2
---
 browser/config/version.txt | 2 +-
 config/milestone.txt       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/config/version.txt b/browser/config/version.txt
index a5015302cc..2bfb4c4682 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-40.0.1
+40.0.2
diff --git a/config/milestone.txt b/config/milestone.txt
index 838cdc0242..509a61ceca 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-40.0.1
+40.0.2