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

[Martin Stransky]

commit c4fec19dbb106c14180a2f69c372ff2967ed4c6d
Merge: c1bcbda 537c1d3
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Dec 23 15:44:28 2014 +0100

    Merge branch 'master' into f21

 firefox.spec       |    8 +++++++-
 rhbz-1173156.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---