From: Henri Sara <hesara@vaadin.com>
Date: Thu, 5 Jun 2014 13:28:23 +0000 (+0300)
Subject: Merge branch 'valo' into 7.3
X-Git-Tag: 7.3.0.alpha3~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bb63b748f08369dd479d01f8bca46886c7503b60;p=vaadin-framework.git

Merge branch 'valo' into 7.3

Conflicts:
	WebContent/release-notes.html

Change-Id: I1cc3028cac865ac83116d666ccc8c1ce7c1b4ccd
---

bb63b748f08369dd479d01f8bca46886c7503b60