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

[Martin Stransky]

commit 39d67ec18c698890206789b63670c485a218b877
Merge: 840be9b dfbf94f
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jan 2 15:39:49 2015 +0100

    Merge branch 'master' into f20

 firefox-gtk3-atk.patch |   14 -------
 firefox.spec           |    9 +++--
 mozilla-1110211.patch  |   95 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 17 deletions(-)
---