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

[Martin Stransky]

commit d30ff8a441c95a41579960ed12ac641ccc196f87
Merge: b215759 8fc5a26
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Jan 20 14:39:01 2015 +0100

    Merge branch 'master' into f21

 mozilla-975919-gtk3-hidpi.patch |  338 ++++++---------------------------------
 1 files changed, 52 insertions(+), 286 deletions(-)
---