Merge branch 'release-3.0' into 'release-3.0'
commit54efa9ba3f348ffcfe191f98a4ecefbd68f9eb5d
authorBarry Warsaw <barry@python.org>
Sat, 16 May 2015 02:29:53 +0000 (16 02:29 +0000)
committerBarry Warsaw <barry@python.org>
Sat, 16 May 2015 02:29:53 +0000 (16 02:29 +0000)
tree6d2ce04a9781587e9fd51436c6db8d38f4ea6ec7
parent63a9cb13cb3df4d5ccd7dfcf656978c4fe8ee6f6
parent8c471e067c4b31064c2f69c0afd048a7e756a429
Merge branch 'release-3.0' into 'release-3.0'

Fix issue #3 by searching for the 'master' script in several possible locations

See merge request !11