Cut 1.10.6
Merge branch '1.10' into 1.11

Conflicts:
	paramiko/__init__.py
	setup.py
	sites/www/changelog.rst
Cut 1.11.4
Merge branch '1.11' into 1.12

Conflicts:
	paramiko/__init__.py
	setup.py
Cut 1.12.2
Merge branch '1.12'

Conflicts:
	sites/www/changelog.rst