From: Marko Gronroos <magi@vaadin.com>
Date: Fri, 23 Dec 2011 08:32:16 +0000 (+0200)
Subject: Merge branch 'master' of ssh://dev.vaadin.com/vaadin
X-Git-Tag: 7.0.0.alpha1^0
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d32c3d2921ed874baa29e333c3811e8cb85e474e;p=vaadin-framework.git

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

d32c3d2921ed874baa29e333c3811e8cb85e474e