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

[Martin Stransky]

commit 7b53bcb3759962f1f5b30a8603c101e4003ed90f
Merge: 6662fa3 f12a119
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sat Nov 29 18:20:59 2014 +0100

    Merge branch 'master' into f19

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