From: John Ahlroos <john@vaadin.com>
Date: Mon, 10 Sep 2012 09:34:31 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 7.0.0.beta1~78
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=12513bd7bbe19f5574e64a7a6e0de0113c860dbc;p=vaadin-framework.git

Merge remote-tracking branch 'origin/master'
---

12513bd7bbe19f5574e64a7a6e0de0113c860dbc