From: Henri Sara <hesara@vaadin.com>
Date: Tue, 12 Nov 2013 09:27:07 +0000 (+0200)
Subject: Merge branch '7.1' into testbench4
X-Git-Tag: 7.2.0.beta1~169^2~5^2~5^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9885b8c7d70d1f9bdfeb7ebcef1a85a5fdf9fbe5;p=vaadin-framework.git

Merge branch '7.1' into testbench4

Conflicts:
	publish.xml

Change-Id: Ic8187a44ac731a930921a6ddcbe0f7eb07deef7e
---

9885b8c7d70d1f9bdfeb7ebcef1a85a5fdf9fbe5