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

[Martin Stransky]

commit 840be9b165931a811191b8fc6dff65d0304133ab
Merge: 5c71faa af8f6b3
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Dec 23 15:57:02 2014 +0100

    Merge branch 'master' into f20

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