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)
commit88b5af98104164d710284987a34a911f60a07f9c
tree13842861dfd20ada3cebbf903f9b7d371fc563f9
parentff802b46e5bb9a465807fc5f8853695e1661e6e7
parent5f46763696f2b5cc3758d6efa568005cbb250a68
Merge branch 'master' into better_warnings
test/test_option_consistency.py