Fixed an issue that flattened a multi-line custom prompt into a single line, and cleaned up the prompt prefixing behavior
Make not having setuptools or pip sdists a fatal error
develop branch is now 1.11.dev1
merge from release-1.10
Merge branch 'release-1.10' into develop
merge from release-1.10 branch
merge from release-1.10 branch
Merge branch 'develop' of github.com:pypa/virtualenv into develop

Conflicts:
	docs/news.rst
	virtualenv.py
Remove stray 'either'

I believe this 'either' stems from the dark times of the distribute and setuptools schism.
Merge pull request #460 from hynek/patch-1

Remove stray 'either'
Merge branch 'master' into develop

Conflicts:
	virtualenv.py
Merge pull request #447 from pfmoore/no_sdist_fatal

Make not having setuptools or pip sdists a fatal error
activate.fish and activate.csh are sourced and cannot be relocated
Fix URL for fish
update PyPy's homepage. fixes #476
Fix missing module for python 3.4

Issue #463
Merge pull request #478 from pnasrat/python34-fix

Fix missing module for python 3.4
Merge pull request #475 from alexrudnick/fix_fish_url

Fix URL for fish shell
Merge pull request #474 from jhermann/relocate-only-x-bit-scripts

activate.fish and activate.csh are sourced and cannot be relocated
Indent code for majver == 3 and minver >= 4 and add '_collections_abc' as
required module, needed as of Python 3.4.0a4