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

[Martin Stransky]

commit 20846853e938ca2e56b27349f1162bdfa6ed8e0a
Merge: e7d7acd e6235fd
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Jan 2 15:44:39 2015 +0100

    Merge branch 'master' into f19

 firefox.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---