Merge branch 'master' into metaconfig
authorEmmanuel Garette <egarette@cadoles.com>
Sun, 2 Feb 2014 17:21:22 +0000 (18:21 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sun, 2 Feb 2014 17:21:22 +0000 (18:21 +0100)
commitf8faec408fe3546b4566c165d4116aa7f3cd1add
treeb9ddb84017b400700b5400c64687bc87e511eb1f
parentb606d23801f04d87c7e6eb3293579b457574e036
parentced260046c89f2e98a8ec26b859e9750e512749c
Merge branch 'master' into metaconfig
test/test_state.py
tiramisu/config.py
translations/fr/tiramisu.po