Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 18 Jan 2014 09:25:09 +0000 (10:25 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 18 Jan 2014 09:25:09 +0000 (10:25 +0100)
1  2 
tiramisu/setting.py

Simple merge