Bug 860625 - Use asynchronous getCharsetForURI in BookmarkJSONUtils.jsm. r=mak
Bug 873486 - Remove wrong C++11 virt-specifier MOZ_OVERRIDE in method definition. r=mattwoodrow