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

[Martin Stransky]

commit 71edef5a9b0160160e0fd41342848228bf0eb48f
Merge: 60e8078 f12a119
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sat Nov 29 18:22:47 2014 +0100

    Merge branch 'master' into f20

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