commit 522558c8211987bcfd79685e633d47a455407355 Merge: 2a36205 1bde413 Author: Georg Koppen gk@torproject.org Date: Tue Jul 28 22:13:26 2015 +0000

Merge remote-tracking branch 'pc/bug16488-01' into tor-browser-38.1.0esr-5.0-1

browser/app/profile/000-tor-browser.js | 1 + browser/base/content/browser-fxaccounts.js | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)