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

[Jan Horak]

commit 6b9838f222b9a8466b08f281881bd842e307e2c9
Merge: d067b5d 90c34db
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Dec 5 14:01:29 2014 +0100

    Merge branch 'master' into f20

 firefox.spec                   |    7 +++-
 mozilla-1097550-dict-fix.patch |   72 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletions(-)
---