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

[Martin Stransky]

commit c357929659a68fedfeeaeef79450c23f87b33b8d
Merge: 6569742 fb99c01
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Jan 22 12:32:02 2015 +0100

    Merge branch 'master' into f20

 firefox-35.0-flash-click-to-play.patch |   12 ++++++++++++
 firefox.spec                           |   13 +++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
---