From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Mon, 10 Feb 2014 11:39:51 +0000 (+0200)
Subject: Merge commit '65052825df68c109d290bb12ca28b18a2ea613fe' into master
X-Git-Tag: 7.2.0.beta1~170
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b84950314902c4b34f5dda0e97410624a79f3135;p=vaadin-framework.git

Merge commit '65052825df68c109d290bb12ca28b18a2ea613fe' into master

6505282 Fix typo (#11186)

Conflicts:
	server/src/com/vaadin/annotations/Widgetset.java

Change-Id: Ibc49522651b1063baefc0010f7429f2b95a261ab
---

b84950314902c4b34f5dda0e97410624a79f3135