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

[Martin Stransky]

commit 964afe7095794a4100ff62d5abf6c61e72de067c
Merge: e15fe3e 4c8e8dd
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Mar 11 15:30:04 2015 +0100

    Merge branch 'master' into f20

 firefox-aarch64.patch | 72 ---------------------------------------------------
 firefox.spec          |  6 ++---
 2 files changed, 2 insertions(+), 76 deletions(-)
---