Bug 948574 - Provide limited access to nsISiteSecurityService apis in the child, and prevent the direct creation of nsISiteSecurityService. r=bz, sr=ptheriault, original author: David Keeler <dkeeler@mozilla.com>
Bug 1040080 - Update nsIMessageManager.idl notes about in-process child process message manager. r=smaug
Bug 1040994 - Add LIMIT support for search history content provider. r=rnewman

--HG--
extra : rebase_source : b210034222a4a47d23a441a1915461374827471e
Merge mozilla-central and fx-team
Bug 1041149 - Remove unused variable in generateScreenshotFor in canvas.js, r=past
Bug 1041157 - Add link to the discussion about using the same context with multiple canvases, for the replayAnimationFrame function in canvas.js, r=past
Bug 1041237 - The bitmask enums flags calculation for getBitToEnumValue is flawed, r=jsantell
Bug 1041250 - Make texParameterf and texParameteri functions take enums for all params, r=jsantell
Bug 1041158 - Properly cleanup the framebuffer binding after generating a screenshot from a webgl context, r=rcampbell
Bug 1041166 - Rename `lastDrawCallScreenshot` to `animationFrameEndScreenshot` in canvas.js, r=past
Bug 1041225 - Generating a screenshot is very slow when the content canvas has obnoxious dimensions, r=rcampbell
Followup for bug 1041225 and bug 1041158, fix a couple of typos, r=rcampbell
Merge fx-team to m-c a=merge