Merge tag 'release/1.0_2.4.1'
authorDaniel Dehennin <daniel.dehennin@ac-dijon.fr>
Wed, 5 Feb 2014 10:22:17 +0000 (11:22 +0100)
committerDaniel Dehennin <daniel.dehennin@ac-dijon.fr>
Wed, 5 Feb 2014 10:22:17 +0000 (11:22 +0100)
Hotfix release 1.0~2.4.1

1  2 
tiramisu/setting.py

Simple merge