Merge m-c to b2g-inbound.
commitf826d1a97fcbee998e1f147468ddbfad565f10cb
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 27 May 2014 20:24:25 +0000 (27 16:24 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Tue, 27 May 2014 20:24:25 +0000 (27 16:24 -0400)
treee555cae30ab86888b307d676c0cb87bc07070e13
parentcbce8855916e4663dd243061a3397ee3b4fd3492
parent4a08636d20a244bd0fe259c8f6fc9d02c42aed9a
Merge m-c to b2g-inbound.
b2g/chrome/content/settings.js
dom/tests/mochitest/general/test_interfaces.html
dom/webidl/moz.build