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

[Martin Stransky]

commit 980d07621177ff5175295b5d6cf0fc85475425c1
Merge: 2084685 791018e
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jan 2 16:13:26 2015 +0100

    Merge branch 'master' into f19

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