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

[Martin Stransky]

commit 5b81ab8acadda6fa964fe6bf0ee781b999b43937
Merge: 5e8716f 5da2a1e
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Mar 10 20:29:35 2015 +0100

    Merge branch 'master' into f20

 firefox-aarch64.patch   | 42 ++++++++++++++++++++++++++++++++++++++++++
 firefox.spec            |  8 ++++----
 mozilla-build-arm.patch | 42 ------------------------------------------
 3 files changed, 46 insertions(+), 46 deletions(-)
---