Merge pull request #1168 from Lukasa/freeze
authorKenneth Reitz <me@kennethreitz.com>
Wed, 6 Feb 2013 19:53:55 +0000 (11:53 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Wed, 6 Feb 2013 19:53:55 +0000 (11:53 -0800)
Feature freeze.


Trivial merge