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)
commitc68f928254d56ef7d5a82979728b8c9879d2280f
tree922b4e2c2cf3e2a73276bf040aaa97ba048a64b6
parent9fc7059140fd5130881d593f2f1e543722b8f23e
parentff954e16f141bac5696632a50db31cbaf3746044
Merge pull request #1168 from Lukasa/freeze

Feature freeze.