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

[Martin Stransky]

commit eeefe44ddd46cbba9ae4eb506c2d76d9d4aa5052
Merge: b290042 90cf500
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Dec 1 12:05:03 2014 +0100

    Merge branch 'master' into f21

 firefox.spec           |    4 -
 mozilla-858919-2.patch |   28 ----
 mozilla-858919-3.patch |  144 ---------------------
 mozilla-858919.patch   |  323 +++++++++++++++++++++++++++++++-----------------
 4 files changed, 208 insertions(+), 291 deletions(-)
---