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)
Tests: python2.6 compat (`assertIn` new in python2.7)


Trivial merge