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)
commiteec9bdd434f3de1226edfc07772e16753fcb3c2d
tree8079e67884dd53b029b06896008863473972af62
parentf74d5e96dd6ff73f0313db654091f58557329605
parent767f758aacba8f70721fc1abbeb1d8ad929a084c
Merge pull request #1408 from wasw100/master

cookies.morsel_to_cookie morsel['expires'] can't be strtime, and morsel['max-age'] convert to expires problem repair