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

[Martin Stransky]

commit 8531751adb1b7024e087d4a392415df3d25d0c78
Merge: 4fd6c4f 160d42f
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sat Mar 21 20:03:23 2015 +0100

    Merge branch 'master' into f20

 .gitignore   | 2 ++
 firefox.spec | 7 +++++--
 sources      | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
---