Jeff Forcier c7f67445f7 Merge branch '1.12' into 1.13 ... Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst		2014-05-07 14:10:07 -07:00
..
docs	Errything uses intersphinx to Python	2014-04-24 10:12:15 -07:00
www	Merge branch '1.12' into 1.13	2014-05-07 14:10:07 -07:00
shared_conf.py	Show Travis status in website sidebar	2014-04-24 10:14:35 -07:00