Merge branch 'release' into stable
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:14:27 +0000 (16:14 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:14:40 +0000 (16:14 +0100)
commit9081aae061b8d017ee492fcdeacd0d2e75c19657
tree57b41f085196e0852feb6a409a0e0607fae58d9d
parent4bf31f298fa3d49bd56abfd52e5d1693fa7ed554
parent30400131a4c18e9a0e0895d517c620b599aaddee
Merge branch 'release' into stable

Conflicts:
Source/WebCore/ChangeLog
Source/WebKit/qt/ChangeLog

Change-Id: Id01082a2a19811f59b08068331a658afe9eefbdb
Source/WebCore/ChangeLog
Source/WebCore/WebCore.pri