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

[Martin Stransky]

commit 4399bc8edb0b50460709c73a244427d9af0190ee
Merge: 3a4c2d3 a3e5347
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Mar 5 14:10:37 2015 +0100

    Merge branch 'master' into f20

 firefox.sh.in         |   4 +-
 firefox.spec          |   9 +-
 mozilla-1080319.patch | 870 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 880 insertions(+), 3 deletions(-)
---