Cut 1.12.1

Cut 1.11.3

Cut 1.10.5

Merge branch '1.11'

Conflicts:
	paramiko/__init__.py
	setup.py

Merge branch '1.10' into 1.11

Updated versions for 1.11.2.

Conflicts:
	paramiko/__init__.py
	setup.py

Update version for 1.10.4

Christ almighty I hate non-DRY versioning

Not sure how this got updated :(

Version bump/dumb-fix

Version bump