Emmanuel Garette 5d8b5719a0 Merge branch 'master' into orm
Conflicts:
	test/test_config_api.py
	tiramisu/autolib.py
	tiramisu/config.py
	tiramisu/option.py
	tiramisu/value.py
2014-04-13 10:30:42 +02:00
..
2014-04-13 10:30:42 +02:00
2014-03-31 22:38:56 +02:00
2014-02-04 21:14:30 +01:00
2014-02-02 18:21:09 +01:00
2014-01-06 14:40:29 +01:00
2014-03-06 22:09:12 +01:00
2013-12-09 18:56:29 +01:00
2014-02-06 22:25:04 +01:00
2014-04-12 22:47:52 +02:00
2013-08-28 21:13:42 +02:00