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

[Martin Stransky]

commit c0a16e7c64134ad1d664889bede26a27c939ce1e
Merge: e183733 83ad358
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Jan 12 09:23:06 2015 +0100

    Merge branch 'master' into f21

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