Bug 915643 - v2.0 [Email] Clear old notifications once Notification.get is available r=asuth a=bajaj
Merge pull request #23926 from jrburke/bug915643-email-clear-notifications-v2.0

Bug 915643 - v2.0 [Email] Clear old notifications once Notification.get is available r=asuth a=bajaj
Merge pull request #24233 from davidflanagan/bug1070195

Bug 1070195: free canvas memory after creating a video poster image in Camera r=wilsonpage(cherry picked from commit 3563ddca35a52e7a533dcfc7996e74b78c6e36c8)
Merge pull request #24240 from davidflanagan/bug1070195-v2.0

Merge pull request #24233 from davidflanagan/bug1070195
Bug 1014605 - [Browser][V2.0] Cannot add a RTSP shortcut on homescreen

* Add rtsp url support in the manifest.webapp of the bookmark app.

Conflicts:
	apps/sharedtest/test/unit/url_helper_test.js