Merge mozilla-beta to b2g34. a=merge
commit1d58808f4c822547cae66122f625eee979f9dc7f
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 3 Nov 2014 22:29:27 +0000 (3 17:29 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Mon, 3 Nov 2014 22:29:27 +0000 (3 17:29 -0500)
tree6ba23193bf25cfd8d255e1daadd61d1bdd462e65
parent81c4abf6d87e74c010ed4b15405fed9ea9c4033f
parent139f8b2eb6af937284f37ed758bba92f9a70faf4
Merge mozilla-beta to b2g34. a=merge