[Merge] lp:~uriboni/webbrowser-app/merge-url-functions into lp:webbrowser-app

[Olivier Tilloy]

Review: Needs Fixing

Riccardo’s branch has now been merged into trunk, and there is indeed a conflict when merging this one. Please resolve, and address the minor comment above, and this will be good to merge.
-- 
https://code.launchpad.net/~uriboni/webbrowser-app/merge-url-functions/+merge/257641
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.