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

[Jan Horak]

commit 89b27da54dcd28b552ae462fdd77cb15d8a16a06
Merge: d8fc046 6bfee0e
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Feb 20 13:53:38 2015 +0100

    Merge branch 'master' into f21

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