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

[Martin Stransky]

commit 5f7499e4bd4fc22fe0411e34921ad6abd8e44068
Merge: aacb217 55619a0
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Dec 10 15:01:42 2014 +0100

    Merge branch 'master' into f20

 firefox-redhat-default-prefs.js |    1 +
 firefox.spec                    |    9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
---