Update version for 1.10.4
Merge branch '1.10' into 1.11

Updated versions for 1.11.2.

Conflicts:
	paramiko/__init__.py
	setup.py
Merge branch '1.11'

Conflicts:
	paramiko/__init__.py
	setup.py