Merge mozilla-beta to b2g34. a=merge
commitf0c34e87a8eb7575298a5e16ec07ce35201e454c
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 21 Oct 2014 21:24:50 +0000 (21 17:24 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Tue, 21 Oct 2014 21:24:50 +0000 (21 17:24 -0400)
tree8a59fe7f17354d00392db384406dc13e59441eb2
parent11888f89b688b7ced9702adf4f5040780e3459cb
parent23765d4324fc72c0ad48888e73a0b1ad01e53794
Merge mozilla-beta to b2g34. a=merge