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)
commit1b87e1d9bbbfb7cd80f820ac7ca1c9c0ac89d2cf
tree1b77778c89e44e14547749e75d27e137e35132fe
parente6a949635f3b1f7b05ab519a13fa459e60b0c954
parent071035854b3a5cf7f490cd5c85d86a3dc4aff59c
Merge branch '2.0'
test/test_option_setting.py
tiramisu/option/masterslave.py