Merge branch 'master' into lgpl
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 15 Mar 2014 09:11:17 +0000 (10:11 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 15 Mar 2014 09:11:17 +0000 (10:11 +0100)
1  2 
tiramisu/autolib.py
tiramisu/config.py
tiramisu/option.py
tiramisu/setting.py
tiramisu/storage/dictionary/setting.py
tiramisu/storage/sqlite3/setting.py
tiramisu/value.py

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge