From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Fri, 9 May 2014 05:18:21 +0000 (+0300)
Subject: Merge branch 'master' into 7.2
X-Git-Tag: 7.2.0~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7af883e7e74bc2193bcc0ddeff9ec47c945f7b16;p=vaadin-framework.git

Merge branch 'master' into 7.2

* 9b3df56 - (origin/master, origin/HEAD, master) Actually close push connection in disconnect() (#13716)
* f21c108 - Fix improper merge of 3d0ff32b from 7.1 to master (#13620)
* 3184af5 - Convert the ComboBoxClosePopupRetainText test to TB4 to avoid false failures.
* b136dd5 - Convert the AccordionClipsContent test to TB4 to avoid false failures.
* 50ea89e - Update Atmosphere client. (#13727)
* 78981f1 - Fix occasionally misplaced error indicators in Buttons (#13723)
* 8fb9121 - Fix misleading message. Close does not always mean reconnect
* 3d42856 - Removed irrelevant readme file

Change-Id: I1c871160a47da3e720f2b7d06c5ab3601a17d053
---

7af883e7e74bc2193bcc0ddeff9ec47c945f7b16