Bug 886149 - Fix: Undefined last crash id can causes exception in delayed startup. r=bbondy
Merge m-c to m-i
bug 883346 permissions support for standalone chat window, r=felipe
bug 884686: inline add-on settings: don't set prefs on type=multi if no prefs are specified (r=darktrojan)
Merge mozilla-central into mozilla-inbound
Remove two unused variables in nsNSSCertificateDB.cpp, no bug
Bug 882890 - Add fake vertex attribute 0 disabling to the getVertexAttrib function to improve WebGL compatibility with driver limitations. r=bjacob
Bug 579517 follow-up: Remove NSPR types that crept in