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

[Jan Horak]

commit 03e6635e5f7f666908b462b60c7ebd2f9090ba57
Merge: 7026c6d bb317b8
Author: Jan Horak <jhorak at redhat.com>
Date:   Thu Jan 15 15:33:30 2015 +0100

    Merge branch 'master' into f20

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