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

[Martin Stransky]

commit 48a4c853fab39ea92a6ab0e9c3a9b896f98734e4
Merge: 3ac3883 f12a119
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sat Nov 29 18:22:57 2014 +0100

    Merge branch 'master' into f21

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