Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Thu, 9 Jan 2014 19:32:17 +0000 (20:32 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Thu, 9 Jan 2014 19:32:17 +0000 (20:32 +0100)
commitcde04d654aab32ac462c6ff73eed9174cb2157d6
tree312b6b3ab803aaf0e333f7acdb2c1469ac87d1ec
parent64ca069a0bd3dac7e0c7be3d39d94587bbca6faa
parent40ecddf242f2e2d1c64d978d3f629317232c1749
Merge branch 'master' into orm

Conflicts:
tiramisu/setting.py
tiramisu/config.py
tiramisu/setting.py