Merge mozilla-beta to b2g37. a=merge
commit3704d5c5df3985185c4cf134a79a92994550608c
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 23 Feb 2015 23:52:38 +0000 (23 18:52 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Mon, 23 Feb 2015 23:52:38 +0000 (23 18:52 -0500)
tree97a6846129655554a43fe2bc45c60c422201dac8
parentfee8958a84802dcd2c02dad135351d12f07e379e
parentd30a57a342a5afff70352ec1e152cdbdc9749055
Merge mozilla-beta to b2g37. a=merge