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

[Jan Horak]

commit d8fc0461772c360918458289633e043d12d5a291
Merge: 92ff2fe 8a0ee5a
Author: Jan Horak <jhorak at redhat.com>
Date:   Fri Feb 20 11:16:04 2015 +0100

    Merge branch 'master' into f21

 .gitignore                     |   2 +
 firefox.spec                   |  20 +-
 mozilla-1097550-dict-fix.patch |  72 -------
 mozilla-1097592.patch          |  56 ------
 mozilla-1129859-dictfix2.patch | 419 +++++++++++++++++++++++++++++++++++++++++
 mozilla-858919.patch           | 365 -----------------------------------
 sources                        |   4 +-
 7 files changed, 433 insertions(+), 505 deletions(-)
---