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

[Martin Stransky]

commit 84f68b9aa01c809117ff1b658508756c93153916
Merge: 5698a81 d298a00
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sat Nov 29 18:13:49 2014 +0100

    Merge branch 'master' into f21

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