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

[Martin Stransky]

commit 4a6bca78ad028af846c843e094c74008ccc5e4c0
Merge: 5b81ab8 8ff02cb
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Mar 10 20:30:48 2015 +0100

    Merge branch 'master' into f20

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