Jeff Forcier ec2460fb3c Merge branch '1.11' into 1.12 ... Conflicts: paramiko/__init__.py setup.py		2014-05-07 13:40:19 -07:00
..
docs	Link back to WWW in docs sidebar	2014-03-31 16:19:40 -07:00
www	Merge branch '1.11' into 1.12	2014-05-07 13:40:19 -07:00
shared_conf.py	This setting no longer needed & causes warnings if left in	2014-04-01 13:28:54 -07:00