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

[Martin Stransky]

commit ca507affd965493ca7f7e3b0c668aaa71bbccd26
Merge: a344d1b af8f6b3
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Dec 23 15:56:46 2014 +0100

    Merge branch 'master' into f19

 firefox.spec          |    3 +++
 mozilla-1050258.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 0 deletions(-)
---