Merge branch 'master' into better_warnings
authorEmmanuel Garette <egarette@cadoles.com>
Wed, 12 Mar 2014 21:13:20 +0000 (22:13 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Wed, 12 Mar 2014 21:13:20 +0000 (22:13 +0100)
1  2 
test/test_option_consistency.py

Simple merge