Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 13 Sep 2013 16:29:33 +0000 (18:29 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 13 Sep 2013 16:29:33 +0000 (18:29 +0200)
commit39a94d7c2c5d720ee6c8743b7315c7040afdaae1
tree3163a177a6b26598b39ad1bd94aadb452746ab14
parentee8436b6ee3bb3742316b51d3b6bf4330f6c81b1
parent6eecd106312582cacbfce3085e5a7b0b82778c92
Merge branch 'stable' into dev

Conflicts:
Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

Change-Id: Iaa6209d0d611d18b8c916bcd165c8bf5b7441b7b
Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h