Merge branch 'master' into orm
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 25 Jan 2014 09:22:17 +0000 (10:22 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 25 Jan 2014 09:22:17 +0000 (10:22 +0100)
commitcbfb5a45b014393673986fc9436c5ddc80b2d434
tree8aa0ed05f8a5ef231ce84544bc98544fcbc8648e
parent3b3e5216fe5a1fccb78ab61b480e69c71729f2c4
parent21a67971c54a6d83220e051bb4c7b735256a77ae
Merge branch 'master' into orm
tiramisu/setting.py