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

[Martin Stransky]

commit ebc11812f00b753267da1dc5cae9bfb9c7efdb4a
Merge: 39d67ec e6235fd
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jan 2 15:44:49 2015 +0100

    Merge branch 'master' into f20

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