Merge mozilla-beta to b2g37. a=merge
commitb26a6e080ca63ede1404ea4326ca31a42eade2c2
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 11 Mar 2015 00:21:51 +0000 (10 20:21 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Wed, 11 Mar 2015 00:21:51 +0000 (10 20:21 -0400)
tree92121571e5b29c2952bd3612addee327b87def2b
parent1e3e942aabb97799eadbbcf74f3375260480caf8
parent2fdc5be3c282edb6c486651aba68945c9b48e734
Merge mozilla-beta to b2g37. a=merge