Merge pull request #1062 from philfreo/patch-2
authorKenneth Reitz <me@kennethreitz.com>
Sat, 22 Dec 2012 22:10:17 +0000 (14:10 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Sat, 22 Dec 2012 22:10:17 +0000 (14:10 -0800)
Using 'master' branch for development


Trivial merge