Merge branch 'master' into metaconfig
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 28 Sep 2013 20:49:50 +0000 (22:49 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 28 Sep 2013 20:49:50 +0000 (22:49 +0200)
1  2 
tiramisu/config.py

Simple merge