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

[Martin Stransky]

commit b89627b5c218bea5d6b6e1d9e5c2ddcb254895c2
Merge: 6180221 a3e5347
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Mar 5 14:10:50 2015 +0100

    Merge branch 'master' into f21

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