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

[Martin Stransky]

commit ad2e17741c6868e658bb8f6cebcee8652485d7f3
Merge: 25fa74c 8ff02cb
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Mar 10 20:30:56 2015 +0100

    Merge branch 'master' into f21

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