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

[Martin Stransky]

commit e15fe3ec96ae02275ff0af3d2f7488809afdc5d7
Merge: 4a6bca7 2e164b4
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Mar 11 13:16:21 2015 +0100

    Merge branch 'master' into f20

 firefox-aarch64.patch | 36 +++++++++++++++++++++++++++++++++---
 firefox.spec          |  4 ++--
 2 files changed, 35 insertions(+), 5 deletions(-)
---