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

[Martin Stransky]

commit 5a71a4598d059c5f7b5046a973395cff26ee621c
Merge: 9146d48 fbaa245
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Mar 10 09:21:36 2015 +0100

    Merge branch 'master' into f21

 firefox.spec            | 13 ++++++------
 mozilla-build-arm.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 6 deletions(-)
---