Merge branch 'feature/multipart-encode' into develop
authorKenneth Reitz <me@kennethreitz.com>
Mon, 14 Feb 2011 14:45:35 +0000 (09:45 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 14 Feb 2011 14:45:35 +0000 (09:45 -0500)

Trivial merge