Emmanuel Garette 64ca069a0b Merge branch 'master' into orm
Conflicts:
	test/test_config.py
	tiramisu/autolib.py
	tiramisu/option.py
	tiramisu/value.py
2013-12-12 17:50:42 +01:00
..
2013-09-07 22:37:13 +02:00
2013-12-12 17:50:42 +01:00
2013-08-28 21:13:42 +02:00
2013-08-28 21:13:42 +02:00
2013-12-09 18:56:29 +01:00
2013-09-07 17:25:22 +02:00
2013-08-28 21:13:42 +02:00