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

[Martin Stransky]

commit fff1bcd7a0a7d15b2cb455ecec30c2f980722d82
Merge: 641a290 d344051
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Jan 12 11:31:45 2015 +0100

    Merge branch 'master' into f20

 firefox.spec                       |    3 +
 mozilla-1073117-button-focus.patch |   78 ++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 0 deletions(-)
---