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

[Jan Horak]

commit fbded67fb348d8167be2cb01d6e6d24e4c0f798f
Merge: 8a75124 c1906be
Author: Jan Horak <jhorak at redhat.com>
Date:   Mon Mar 9 10:20:00 2015 +0100

    Merge branch 'master' into f20

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