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

[Martin Stransky]

commit 612856d9dd1654d52769083058e5b3c94a0eb4a5
Merge: 5a71a45 cea5cd5
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Tue Mar 10 16:27:54 2015 +0100

    Merge branch 'master' into f21

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