Merge pull request #1816 from daftshady/master
authorKenneth Reitz <me@kennethreitz.org>
Thu, 19 Dec 2013 20:38:34 +0000 (12:38 -0800)
committerKenneth Reitz <me@kennethreitz.org>
Thu, 19 Dec 2013 20:38:34 +0000 (12:38 -0800)
Re-raise DecodeError


Trivial merge