From 6c022639adfcf2c0b8db52062b32a0479b07ad7d Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 16 Apr 2014 11:43:58 +0300
Subject: Merge from 7.1 to 7.2

Merge: no
Change-Id: Ibfe17c35ec72985823389c75a5c3135998443068
---
 scripts/automerge7.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh
index abc577f6b9..3349d8d622 100755
--- a/scripts/automerge7.sh
+++ b/scripts/automerge7.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 IGNORE=7.0
-FROM=7.2
-TO=master
+FROM=7.1
+TO=7.2
 
 IGNORE_HEAD=origin/$IGNORE
 FROM_HEAD=origin/$FROM
-- 
cgit v1.2.3