Bug 859486 - Add system property to enable the unloading of Wi-Fi drivers r=mrbkap
Bug 860860 - use json instead of simplejson in build-clang.py; r=gps

DONTBUILD because NPOTB
Bug 856358 - Remove ContactProperties types from window. r=gwagner

--HG--
rename : dom/interfaces/contacts/nsIDOMContactProperties.idl => dom/interfaces/contacts/nsIContactProperties.idl
extra : rebase_source : 3581687c7285ed8e9c653d1d71f2b60837708679
Bug 852057 - Sort contacts correctly when givenName or familyName is null. r=gwagner
Backed out changeset f556245d6da1 (bug 856848) for build bustage on a CLOSED TREE.
Backed out changeset 5e573a8f7ce1 (bug 856358) for bustage on a CLOSED TREE.

--HG--
rename : dom/interfaces/contacts/nsIContactProperties.idl => dom/interfaces/contacts/nsIDOMContactProperties.idl