Bug 1085386 - Finish preference activity when hitting action bar "up" button. r=liuche
Bug 1091706 - Ensure spawning only one devtools loader instances. r=jryans
Merge m-c to fx-team. a=merge
Bug 1060138: Fix SDK context-menu API to work in e10s. r=zombie
Bug 1099085 - HawkClient, HawkRequest and RESTRequest should support PATCH requests. r=ckarlof
Bug 1074694 - Allow rooms to be renamed from the conversation window. r=nperriault
Bug 1100463 - DevTools Theme - get rid of 1px offset on the active Inspector tab button;r=bgrins
Bug 1099490 - [e10s] Use nsBrowserStatusFilter in the content to avoid a flood of progress messages being sent to the parent r=billm
Bug 1085691, fix notification indicator when browser window in background, r=dolske
Bug 1080801 - add bug numbers to e10s-failing tests that touch content, rs=comments-only
DONTBUILD because only comments in ini file changed
Bug 1080801 - update more test comments, rs=comments-only
DONTBUILD because comments only change...
Bug 625295 - Allow for per-engine sort parameters to download bookmarks by sortindex. r=rnewman
Bug 1097222 - Extend client record format on desktop. r=markh
Bug 1097542 - Use explicit collation in nsSearchService. r=Waldo,adw

On Android, String.prototype.localeCompare ends up calling strcoll(), which results in an undesirable sort order for search engines.

This patch alters nsSearchService to use nsICollation.compareString directly, which should yield a consistent order across all platforms.

We use kCollationCaseInsensitiveAscii, which ignores case on ASCII characters but preserves ordering between accented and non-accented characters. We can revisit this decision if necessary.
Bug 1091463 - wait for all expected markers from docshell. r=paul
Bug 1093997 - check before cancelling the tab switch, r=mconley
Bug 1094203 - Enable tools if related actor is available. r=jryans
Bug 1096763 - fix webide button issues with customize mode, r=Unfocused

This fixes the button to not call createWidget repeatedly when the button is in the palette.

It also fixes an edge case in CustomizableUI where, if you restore defaults, we don't re-add custom widgets to the list of seen widgets, meaning they'll be restored to their default position on next start, even if you move them after restoring to defaults.
Bug 1100385 - Improve accesskeys in Privacy panel of Preferences. r=mak
merge fx-team to mozilla-central a=merge