From: Marko Gronroos <magi@vaadin.com>
Date: Thu, 22 Dec 2011 18:46:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://dev.vaadin.com/vaadin
X-Git-Tag: 7.0.0.alpha1~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=362fc7d2fc09e97c40089a41d16d8579a39d05ea;p=vaadin-framework.git

Merge branch 'master' of ssh://dev.vaadin.com/vaadin
---

362fc7d2fc09e97c40089a41d16d8579a39d05ea