appium/appium — pull request #1995 by jlipps (2014-03-05 01:52:07+00:00)
Title: fix bad conflict resolution, include uiauto bootstrap when launching ins...

...truments