From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Thu, 26 Jun 2014 15:29:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/5.3' into dev
X-Git-Tag: v5.4.0-alpha1~9
X-Git-Url: http://review.tizen.org/git/?p=contrib%2Fqtwebsockets.git;a=commitdiff_plain;h=3f99082f3bb81982e0c6777875fb5c2a1d9033df

Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	.qmake.conf

Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
---

3f99082f3bb81982e0c6777875fb5c2a1d9033df