Merge branch 'develop' into key_val_lists
authorIan Cordasco <graffatcolmingov@gmail.com>
Tue, 7 Aug 2012 16:11:15 +0000 (12:11 -0400)
committerIan Cordasco <graffatcolmingov@gmail.com>
Tue, 7 Aug 2012 16:11:15 +0000 (12:11 -0400)
commitceec572cb97515c2078f26d5a909f8b99f525183
tree1100fa0479902ffe20ad05d3999abaa0f0bdb2b5
parent1722f289711e3d03b0e00fb548f3e8ea92544775
parenta94fcb87d2ec6c83355e3ce6a89ffc7531e7672c
Merge branch 'develop' into key_val_lists

Conflicts:
    requests/models.py
requests/models.py
requests/sessions.py
tests/test_requests.py