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

[Martin Stransky]

commit 7bb78206a09d0b8e99091935e380763b46d594b8
Merge: c0a16e7 d344051
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Jan 12 11:31:57 2015 +0100

    Merge branch 'master' into f21

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