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

[Martin Stransky]

commit 1241d44895aabcb56056f329b07f106d19e229b0
Merge: 66b4573 55619a0
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Dec 10 15:01:44 2014 +0100

    Merge branch 'master' into f21

 firefox-redhat-default-prefs.js |    1 +
 firefox.spec                    |    9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
---