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

[Martin Stransky]

commit 9e41c6158592c67e34de7521f5f8713482783165
Merge: 7c0515d e6235fd
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jan 2 15:45:06 2015 +0100

    Merge branch 'master' into f21

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