Merge branch 'force_permissive'
authorEmmanuel Garette <egarette@cadoles.com>
Mon, 31 Mar 2014 20:38:56 +0000 (22:38 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Mon, 31 Mar 2014 20:38:56 +0000 (22:38 +0200)
commita3c5e6034f281bbbcc49dcd2905639952fe96894
treef2b8a5fc6930deb28e403f730d26336147786566
parent6413d460b288b0db51866cc160f137e444246245
parentcd52729952a0f29e093813346fc1c04fa5d51d4f
Merge branch 'force_permissive'

Conflicts:
test/test_freeze.py
test/test_freeze.py
tiramisu/config.py
tiramisu/option.py
tiramisu/setting.py
tiramisu/value.py