Merge branch 'log'
authorEmmanuel Garette <egarette@cadoles.com>
Thu, 3 Apr 2014 20:16:08 +0000 (22:16 +0200)
committerEmmanuel Garette <egarette@cadoles.com>
Thu, 3 Apr 2014 20:16:08 +0000 (22:16 +0200)
1  2 
tiramisu/option.py
tiramisu/setting.py

Simple merge
Simple merge