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)
commitd1e86f6d481128bdb6159f520d8058b4fba7b646
treeaa6785a45252580aa45f6a84efcb4bbee729d01d
parenta1f0c29713f1e242a3aa39e3ccdefa3b0c00faae
parentda434a42730ac5716b04ffc6197090402014b9a5
Merge branch 'log'
tiramisu/option.py
tiramisu/setting.py