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

[Jan Horak]

commit 9146d481a55e1fa63b4dad36adeb58cbba8673c8
Merge: 9be684c c1906be
Author: Jan Horak <jhorak at redhat.com>
Date:   Mon Mar 9 10:20:14 2015 +0100

    Merge branch 'master' into f21

 .gitignore            |   2 +
 firefox.spec          |  11 +-
 mozilla-1080319.patch | 870 --------------------------------------------------
 sources               |   4 +-
 4 files changed, 10 insertions(+), 877 deletions(-)
---