Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 25 Jan 2014 15:39:32 +0000 (16:39 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 25 Jan 2014 15:39:32 +0000 (16:39 +0100)
commit880b6366ebb8ba97ee408b6a191bfc599c002762
tree908c89c40680d50101eebe0fdb04aa667f32d4bb
parentcbfb5a45b014393673986fc9436c5ddc80b2d434
parent77adc934e023dfcbc6f36ce3fb312656407407c2
Merge branch 'master' into orm

Conflicts:
tiramisu/setting.py
test/test_config.py
tiramisu/config.py
tiramisu/setting.py
tiramisu/value.py