Bug 1034732 - Port bug 927672 (Get mozmake from tooltool) and bug 1028100 (Add l10n tooltool manifest for windows builds) to hopefully fix the background win64 bit builds. rs=port-by-build-system-peer
Bug 1018241 - Select previous item if Customize was canceled in the filter rule editor. r=mkmelin
Bug 1018960 - Make the message about cleaning out Trash or Junk show which folder will actually be cleaned. ui-r=Josiah, r=mkmelin
Bug 1020339 - Add UI for disabling and clearing Visited Link/Browsing History. ui-r=bwinton, r=mkmelin
Bug 1021684 - Update box.com Filelink implementation to new APIs. r=mconley,philipp

--HG--
rename : calendar/base/modules/OAuth2.jsm => mailnews/base/util/OAuth2.jsm
Fix bug 1021684 - Update box.com Filelink implementation to new APIs - interface extras for extensions. r=clokep