Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Thu, 19 Sep 2013 21:41:33 +0000 (23:41 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Thu, 19 Sep 2013 21:41:33 +0000 (23:41 +0200)
commit42dabaf83563a373e8796914c2aa25dc4b54cc13
tree78eed006f9ca76b6cb2cfc7b0e7ace208f417b3f
parentf0fad828aa39347da60efee4ea461ee00a04b50e
parent4af31da26f816a7abc06924253f7924dbad15991
Merge branch 'stable' into dev

Conflicts:
Source/WebCore/platform/graphics/Font.cpp

Change-Id: I0961de8127cf1c8233036038a324c2567a70533e
Source/WebCore/platform/graphics/Font.cpp