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)
commit6b7db207169d220f32ce3550f3824f6092da1a07
treed5f6617920bde02f16eb06a9870d82cabab9038d
parent7165f732921ff6128ad2de1c14fc11ae1ac6349c
parent4fa33e1a6cfaeb914578702849ef3dceaf8cc44b
Merge branch 'master' into metaconfig
tiramisu/config.py