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

[Martin Stransky]

commit 645fd5190155885c2e6e22cf3dc3116b01c44187
Merge: ebc1181 791018e
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jan 2 16:13:51 2015 +0100

    Merge branch 'master' into f20

 firefox.spec |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---