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

[Martin Stransky]

commit bf1395126617b74e97db66e3baf270df6ab41bef
Merge: 8564211 7a6142b
Author: Martin Stransky <stransky at redhat.com>
Date:   Thu Dec 11 12:04:17 2014 +0100

    Merge branch 'master' into f19

 firefox.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---