From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 24 Jun 2015 10:54:10 +0000 (+0200)
Subject: Merge branch 'crfpa' into dev
X-Git-Tag: 1.1~243
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=83e5dd72b0125edf19c16b4822edd06c840cb815;p=teleforma.git

Merge branch 'crfpa' into dev

Conflicts:
	teleforma/models/core.py
---

83e5dd72b0125edf19c16b4822edd06c840cb815