Bug 984015 - GUIDHelper.getItemId should deliver itself as |this| to his internal executeAsync callback. r=mak
Back out 4774010c55bd (bug 984015) for xpcshell bustage
Merge m-c to f-t
Bug 984156 - Make subview footer menuseparators have a non-zero height to prevent bookmarks folder scrolling issues. r=mak.
Merge m-c to f-t
Bug 955950: add pref to disable "reset firefox" nag, r=MattN
Bug 985212 - check if the username looks like an email address to determine what sync to use. r=rnewman
merge fx-team to mozilla-central