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

[Martin Stransky]

commit d6210ffd4ff9721ddef058c64b8fd9f4342e15ec
Merge: 5698a81 d298a00
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sat Nov 29 18:12:08 2014 +0100

    Merge branch 'master' into f19

 firefox-mozconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---