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

[Martin Stransky]

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

    Merge branch 'master' into f20

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