mozilla-b2g/gaia — pull request #14011 by AndreiH (2013-11-25 12:39:11+00:00)
Title: Bug 924867 - Update test_ftu_with_tour to handle new step for e.me

Conflicts:
tests/python/gaia-ui-tests/gaiatest/tests/functional/ftu/test_ftu_with_tour.py