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

[Martin Stransky]

commit 3a40522277423dc1dedaf205ac14a63f1dc8fa2e
Merge: f258ae4 a8ca2e5
Author: Martin Stransky <stransky at redhat.com>
Date:   Fri Mar 20 10:09:19 2015 +0100

    Merge branch 'master' into f21

 .gitignore   | 2 ++
 firefox.spec | 9 ++++++---
 sources      | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)
---