Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Tue, 4 Feb 2014 20:48:20 +0000 (21:48 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Tue, 4 Feb 2014 20:54:30 +0000 (21:54 +0100)
commit98bd35ad36637c508e2df2aae8f4d12de4bfc9bb
treefc0a3678df4a57a16fd4d1b94b3301b96c868ee4
parent5646fc35a2517e5224f0ad1f3fbd73d513b5214e
parentc52b2f84f42dbfab7c9ab8ee8459d271b45d9593
Merge branch 'master' into orm

Conflicts:
tiramisu/config.py
tiramisu/option.py
test/test_config_api.py
tiramisu/config.py
tiramisu/option.py
tiramisu/setting.py
tiramisu/value.py