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

[Martin Stransky]

commit 60f1e3ca4ab5b874608d9a324d65f12f98b0bcb2
Merge: 9e41c61 791018e
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jan 2 16:14:00 2015 +0100

    Merge branch 'master' into f21

 firefox.spec |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---