[firefox: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/firefox

[Martin Stransky]

commit 4b3c1df993100244ff925cd4d010711d3ff526ed
Merge: d298a00 5698a81
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sat Nov 29 18:14:51 2014 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/firefox

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