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)
commit068f68460dfc12a34aad5dea804d15e9752074fb
tree1692b5405bee52109d3ee49f754092a586af4a6a
parenteabe3bc55f15ebaf4d1f306b8b74dbc9cdc10821
parent9d92ab84d7682da111719de74f599cbf938a7f38
Merge branch 'master' into orm
tiramisu/setting.py