Merge pull request #1408 from wasw100/master
authorKenneth Reitz <me@kennethreitz.com>
Sat, 8 Jun 2013 10:14:32 +0000 (03:14 -0700)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 8 Jun 2013 10:14:32 +0000 (03:14 -0700)
cookies.morsel_to_cookie morsel['expires'] can't be strtime, and morsel['max-age'] convert to expires problem repair


Trivial merge