Merge pull request #191 from kberg/option-consolidation
authorDan Vanderkam <danvdk@gmail.com>
Sun, 30 Dec 2012 15:32:30 +0000 (07:32 -0800)
committerDan Vanderkam <danvdk@gmail.com>
Sun, 30 Dec 2012 15:32:30 +0000 (07:32 -0800)
Option consolidation


Trivial merge