From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Thu, 6 Feb 2014 14:42:09 +0000 (+0200)
Subject: Merge changes from origin/7.1
X-Git-Tag: 7.2.0.beta1~188
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3597d27d9a6441632656ff597d14953f377c2990;p=vaadin-framework.git

Merge changes from origin/7.1

f4fa4e8 Normalize line endings

Change-Id: I48ccf40262eb600b4cbc45e49abb5d5a6258b2db
---

3597d27d9a6441632656ff597d14953f377c2990