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

[Martin Stransky]

commit 7c0515d587d56f4315c217000dab00a13185f5d1
Merge: a4c9644 dfbf94f
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jan 2 15:39:58 2015 +0100

    Merge branch 'master' into f21

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