Bug 797621 - Generic actor event API. r=past
Bug 936380 - Fix gcli screenshot size calculations. r=jwalker
Bug 966895 - [rule view] Adding new rules to the current selection in the CSS rule-view. r=harth
Bug 967156 - Adding class 'black-boxed' to blackboxed source after reload. r=fitzgen
Bug 977262 - Add aria-roles/aria-selected to Toolbox tabs. r=bgrins f=marcoz
Bug 988314 - Clean up and rewrite Inspector tests to use Task.jsm and generators. r=pbrosset
Bug 1030490 - Inconsistent behavior when incrementing values in the CSS rules. r=harth
Bug 1033280 - Ensure that DebuggerClient.request returns a promise. r=jryans,past
Bug 1035540 - Convert Security pane dialogs to be in-content. r=MattN
Bug 1035557 - "about:sessionrestore shows instead of about:welcomeback after a reset". r=smacleod
Bug 1030266 - Ensuring that PlacesDBUtils.telemetry calls its callbacks even in case of error. r=mak
Bug 987230 - use consumeanchor attribute to fix button click, r=enn,mconley

--HG--
extra : rebase_source : 8e52a377eeb708e258f0190fcbc5902c5477c2b8
Bug 1003336 - OS.Constants.Sys.Name should not be "Android" for Firefox OS. r=yoric
Bug 1025828 - Implement a client for webapps actor. r=jryans
Bug 1023402 - API review for OS.File.setPermissions. r=Yoric

--HG--
rename : toolkit/components/osfile/tests/xpcshell/test_osfile_async_setPerms.js => toolkit/components/osfile/tests/xpcshell/test_osfile_async_setPermissions.js
Merge mozilla-central to fx-team
Merge fx-team to m-c. a=merge