Merge mozilla-beta to b2g34. a=merge
commit25a61149ece10479567cc8e9698deeda25558834
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 26 Nov 2014 13:50:39 +0000 (26 08:50 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Wed, 26 Nov 2014 13:50:39 +0000 (26 08:50 -0500)
tree01fbd42c39ec24022c7fdff5639107fc36e8f43c
parent2cfe37a5d1805926d30a100d14b1d81587c71577
parentddef98eabbf3aa5efb2b5e813f979e7a024f86ba
Merge mozilla-beta to b2g34. a=merge