Merge mozilla-beta to b2g34. a=merge
commite051193bd88dc2c5bd1bb879e3a9f8c31679d1c5
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 24 Oct 2014 16:10:33 +0000 (24 12:10 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Fri, 24 Oct 2014 16:10:33 +0000 (24 12:10 -0400)
treec70084827e97dddda09a859b6fc6f60f9c548cfc
parent5870339ca6ad8a297af48ece9f90efb5deb09317
parentfb47216775d95709757f9111fcfec701d9b031eb
Merge mozilla-beta to b2g34. a=merge