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

[Martin Stransky]

commit d76e543060ae9b0936a922f7f387d61da851b5a0
Merge: 1aa1d33 4c8e8dd
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Mar 11 15:30:09 2015 +0100

    Merge branch 'master' into f21

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