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)

Trivial merge