Merge branch 'master' of ssh://git.labs.libre-entreprise.org/gitroot/tiramisu
authorgwen <gremond@cadoles.com>
Wed, 6 Mar 2013 08:34:07 +0000 (09:34 +0100)
committergwen <gremond@cadoles.com>
Wed, 6 Mar 2013 08:34:07 +0000 (09:34 +0100)
1  2 
tiramisu/option.py

Simple merge