Merge mozilla-beta to b2g34. a=merge
commitadaecd73a8066ca6c9c933f59b0e07d4e74d400f
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 13 Nov 2014 19:20:06 +0000 (13 14:20 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Thu, 13 Nov 2014 19:20:06 +0000 (13 14:20 -0500)
tree3dabdede8252e7fd95cf79ffab4ce15e572f1f54
parentff999b94b271e66ecf54493aa0c765867e345c96
parentf6e7e04dcab6de0ab8611d5b78f9eb18d929fd2b
Merge mozilla-beta to b2g34. a=merge