From 103d546133b7ca35aba30cd6b7d9a7b89630c7f7 Mon Sep 17 00:00:00 2001
From: Lukas Blakk <lsblakk@mozilla.com>
Date: Mon, 3 Feb 2014 15:03:10 -0800
Subject: [PATCH] Merging in version bump NO BUG CLOSED TREE

---
 b2g/confvars.sh            | 2 +-
 browser/config/version.txt | 2 +-
 config/milestone.txt       | 2 +-
 mobile/android/confvars.sh | 2 +-
 services/sync/Makefile.in  | 2 +-
 xpcom/components/Module.h  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/b2g/confvars.sh b/b2g/confvars.sh
index 16ecbc1fac1c7..04ad94f3b7187 100644
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=29.0a1
+MOZ_APP_VERSION=30.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_UA_OS_AGNOSTIC=1
diff --git a/browser/config/version.txt b/browser/config/version.txt
index 7bb9404cdf184..507e3256cdde0 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-29.0a1
+30.0a1
diff --git a/config/milestone.txt b/config/milestone.txt
index 4f84a8e2dd0cc..6334341896b6d 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-29.0a1
+30.0a1
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index ff08af9333403..adcb3c759d076 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -5,7 +5,7 @@
 MOZ_APP_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=29.0a1
+MOZ_APP_VERSION=30.0a1
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
diff --git a/services/sync/Makefile.in b/services/sync/Makefile.in
index 88223170e9748..518e2cb51ec39 100644
--- a/services/sync/Makefile.in
+++ b/services/sync/Makefile.in
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Definitions used by constants.js.
-weave_version := 1.31.0
+weave_version := 1.32.0
 weave_id      := {340c2bbc-ce74-4362-90b5-7c26312808ef}
 
 # Preprocess files.
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h
index 13e176d1d7753..2908a2a464e5c 100644
--- a/xpcom/components/Module.h
+++ b/xpcom/components/Module.h
@@ -21,7 +21,7 @@ namespace mozilla {
  */
 struct Module
 {
-  static const unsigned int kVersion = 29;
+  static const unsigned int kVersion = 30;
 
   struct CIDEntry;