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

[Martin Stransky]

commit 3a4c2d318b69ed0821432ac4685cb0297af400b2
Merge: d53e05d d00e26a
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Mar 3 15:49:20 2015 +0100

    Merge branch 'master' into f20

 firefox-mozconfig | 1 +
 firefox.spec      | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
---