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

[Martin Stransky]

commit e04da1fadee51cb54843534236dcda4021741018
Merge: 1418186 02e8ef6
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Dec 12 11:23:05 2014 +0100

    Merge branch 'master' into f20

 firefox.spec          |    7 +++++-
 mozilla-1097592.patch |   56 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletions(-)
---