Merge branch 'cleanup' into 'master'
commit18683868449fd855fcf68a82aef36a7c808e916e
authorBarry Warsaw <barry@python.org>
Sun, 3 May 2015 21:03:57 +0000 (3 21:03 +0000)
committerBarry Warsaw <barry@python.org>
Sun, 3 May 2015 21:03:57 +0000 (3 21:03 +0000)
treeecf066a9c6148ff7ab87790ed9ede79d8f2bf349
parent509d47e31847868818cc234a169b3c3f159848eb
parent5e731762e28b10559dff6663c2131e5044891f2f
Merge branch 'cleanup' into 'master'

Various code cleanups

Remove some unused code, and move the options base class to a more appropriate place.

See merge request !6