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

[Martin Stransky]

commit a66eb9e4034b38e37550f08ad54b8f9515142cea
Merge: 71edef5 5bb5b05
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Dec 1 10:19:57 2014 +0100

    Merge branch 'master' into f20

 .gitignore                  |    2 ++
 firefox-mozstub-build.patch |   12 ------------
 firefox.spec                |   11 ++++++-----
 sources                     |    4 ++--
 4 files changed, 10 insertions(+), 19 deletions(-)
---