Merge pull request #1709 from samuelhug/test-branch
authorKenneth Reitz <me@kennethreitz.org>
Mon, 28 Oct 2013 17:40:52 +0000 (10:40 -0700)
committerKenneth Reitz <me@kennethreitz.org>
Mon, 28 Oct 2013 17:40:52 +0000 (10:40 -0700)
Fix for AppEngine


Trivial merge