Merge pull request #991 from lyndsysimon/master
authorKenneth Reitz <me@kennethreitz.com>
Thu, 6 Dec 2012 18:21:15 +0000 (10:21 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 6 Dec 2012 18:21:15 +0000 (10:21 -0800)
Changes license from ISC to Apache2


Trivial merge