Merge branch 'feature/cookies' into develop
authorKenneth Reitz <me@kennethreitz.com>
Mon, 14 Feb 2011 17:52:50 +0000 (12:52 -0500)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 14 Feb 2011 17:52:50 +0000 (12:52 -0500)
commit8ff8e02ace48c9cf10e2b6fa46177865eaee546d
treebaf85af5d3dfd521322feb380d94a2763bc2fbd1
parent09740c35e1e148b41a7f1384a38e33011471d9dc
parent98c8a78c3e0f3827ef4ba304de9fa74666f0be0e
Merge branch 'feature/cookies' into develop