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

[Martin Stransky]

commit d3407aced5535267845181f3bab1df376243de90
Merge: 0186142 065b9ef
Author: Martin Stransky <stransky at redhat.com>
Date:   Fri Jan 23 15:31:20 2015 +0100

    Merge branch 'master' into f21

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