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

[Martin Stransky]

commit 5e8716f33e02112d81280b4cb5514e2e89a57afd
Merge: ec42350 cea5cd5
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Mar 10 16:27:49 2015 +0100

    Merge branch 'master' into f20

 mozilla-build-arm-webrtc.patch | 23 -----------------------
 1 file changed, 23 deletions(-)
---