Merge m-c to mozilla-inbound. a=merge
commit7cfa54147df41fc1bb78307aa7e518d4233505b4
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 17 Jun 2014 19:43:06 +0000 (17 15:43 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Tue, 17 Jun 2014 19:43:06 +0000 (17 15:43 -0400)
tree2e9db70d2b17e35188b2de2e5af519fc5da891a0
parent211ed1afe60c2ddb5ec82dcc8df9cacaf5710445
parent6f80c55849c36f46f48941f735c8228b7e2f36d0
Merge m-c to mozilla-inbound. a=merge