appium/appium — pull request #86 by bernii (2013-02-01 00:14:25+00:00)
Title: Fixing merge conflicts of another pull request

Fixed merged conflicts of https://github.com/appium/appium/pull/78