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

[Martin Stransky]

commit 641a290b5a72156d6168cdb510070343baafdd75
Merge: 09e8bda 83ad358
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Jan 12 09:22:58 2015 +0100

    Merge branch 'master' into f20

 firefox.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---