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

[Martin Stransky]

commit 92ff2fe92101cad72ce491fefead8afbb481b9a9
Merge: d8eb85b 1c8e85a
Author: Martin Stransky <stransky at redhat.com>
Date:   Mon Feb 9 18:21:09 2015 +0100

    Merge branch 'master' into f21

 firefox-fedora-ua.patch |   21 +++++++++++++++++++++
 firefox.spec            |   10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---