Changed assertIn to assertTrue(... in ...) (2.6 support)
Merge branch 'master' of github.com:dotcloud/docker-py