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

[Jan Horak]

commit d53e05dfa86bf02c3801deef5137cb5bae26fa6c
Merge: a7f25da 6bfee0e
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Feb 20 13:53:22 2015 +0100

    Merge branch 'master' into f20

 firefox.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---