Jeff Forcier fe9171661a Merge branch '1.12' into 1.13 ... Conflicts: paramiko/file.py paramiko/server.py paramiko/sftp_client.py sites/www/changelog.rst		2014-03-13 21:54:12 -07:00
..
_shared_static	Start fleshing out two-site setup	2014-01-21 16:15:30 -08:00
docs	Semi no-op fix to test RTD hooks	2014-03-04 15:45:01 -08:00
www	Merge branch '1.12' into 1.13	2014-03-13 21:54:12 -07:00
shared_conf.py	Attempt to fix docs for py3	2014-03-07 18:46:40 -08:00