From: Artur Signell <artur@vaadin.com>
Date: Fri, 11 Apr 2014 05:41:06 +0000 (+0300)
Subject: Merge from 7.1 to 7.2
X-Git-Tag: 7.2.0.beta1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ee4ae9fac8342f51ff5152cf878df125a743aef3;p=vaadin-framework.git

Merge from 7.1 to 7.2

Change-Id: I3db340a7c971be6abf18514f044114802edfc4de
---

diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh
index 079dec7eea..3349d8d622 100755
--- a/scripts/automerge7.sh
+++ b/scripts/automerge7.sh
@@ -2,7 +2,7 @@
 
 IGNORE=7.0
 FROM=7.1
-TO=master
+TO=7.2
 
 IGNORE_HEAD=origin/$IGNORE
 FROM_HEAD=origin/$FROM