Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Sun, 2 Feb 2014 17:52:13 +0000 (18:52 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sun, 2 Feb 2014 17:52:13 +0000 (18:52 +0100)
commit58972314219547c1c2baf741e35d38f23f10a5be
tree0d20f7801d67a3d0918307efe150d98633034e02
parent870938657081530affc3a5886dc5bfac06284f49
parent26158fc3c41b5cd9e5125a68588f9c9b1c1d1cf5
Merge branch 'master' into orm

Conflicts:
test/test_dereference.py
test/test_state.py
tiramisu/config.py
tiramisu/value.py
test/test_dereference.py
test/test_option_calculation.py
test/test_state.py
tiramisu/autolib.py
tiramisu/config.py
tiramisu/value.py