[firefox/f20: 2/2] Merge branch 'master' into f20

[Martin Stransky]

commit 5e617edfdc56f28a8ef6b074bbd011367bd4d72d
Merge: c357929 59628a9
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Jan 22 13:15:13 2015 +0100

    Merge branch 'master' into f20

 firefox.spec                    |    7 +-
 mozilla-975919-gtk3-hidpi.patch |  311 +++++++++++++--------------------------
 2 files changed, 108 insertions(+), 210 deletions(-)
---