Merge pull request #773 from randomir/develop
authorKenneth Reitz <me@kennethreitz.com>
Fri, 10 Aug 2012 16:03:09 +0000 (09:03 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Fri, 10 Aug 2012 16:03:09 +0000 (09:03 -0700)
commit56b01bf0e639f7a371dea4baef250f54b30f6eab
treef393789d8bf4b825d84f8f9d13d2528a41dc0dbf
parent40ba6b4ec13e599ede207ec6987c37b0c1b54152
parent4da4792844017b7b7e5f78cf106e34a68a08af96
Merge pull request #773 from randomir/develop

Tests: python2.6 compat (`assertIn` new in python2.7)