Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Thu, 12 Dec 2013 16:50:42 +0000 (17:50 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Thu, 12 Dec 2013 16:50:42 +0000 (17:50 +0100)
commit64ca069a0bd3dac7e0c7be3d39d94587bbca6faa
treef50010c7c3107e15f70cc0b0327f129db23cfb9c
parente153cf0e286def90f8cfda5d570012d81b8cee6c
parentc58de18b6215dfffd12f99afd8d0497a8c438b62
Merge branch 'master' into orm

Conflicts:
test/test_config.py
tiramisu/autolib.py
tiramisu/option.py
tiramisu/value.py
test/test_config.py
test/test_option_calculation.py
test/test_option_consistency.py
test/test_requires.py
tiramisu/autolib.py
tiramisu/config.py
tiramisu/option.py
tiramisu/setting.py
tiramisu/value.py