mozilla-b2g/gaia — pull request #13112 by julienw (2013-10-26 11:41:07+00:00)
Title: Revert "Bug 930542 - Fail test_browser_bookmark.py because of bug 930545...

..."

This reverts commit d0a48341b9f258f9971d79f225ceba58e382eceb.

Conflicts:
tests/python/gaia-ui-tests/gaiatest/tests/functional/browser/manifest.ini