Merge branch '2.0'
authorEmmanuel Garette <egarette@cadoles.com>
Wed, 12 Oct 2016 18:50:12 +0000 (20:50 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Wed, 12 Oct 2016 18:50:12 +0000 (20:50 +0200)
1  2 
test/test_option_setting.py
tiramisu/option/masterslave.py

Simple merge
Simple merge