Emmanuel Garette 21c8ed5d76 Merge branch 'master' into orm
Conflicts:
	test/test_option_consistency.py
	test/test_state.py
	tiramisu/option.py
2014-02-06 22:24:50 +01:00
..
2013-09-07 22:37:13 +02:00
2014-02-06 22:17:20 +01:00
2014-02-03 22:11:58 +01:00
2014-01-30 22:55:15 +01:00
2013-08-28 21:13:42 +02:00
2014-02-04 21:14:30 +01:00
2014-02-02 18:21:09 +01:00
2014-02-04 21:14:30 +01:00
2014-01-06 14:40:29 +01:00
2013-12-09 18:56:29 +01:00
2014-02-06 22:17:20 +01:00
2013-09-07 17:25:22 +02:00
2013-08-28 21:13:42 +02:00