From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 16 Jul 2013 00:12:23 +0000 (+0200)
Subject: Merge branch 'crfpa' into tc202
X-Git-Tag: 1.3-TC~36
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d0a445299ed2ae593599d0a09a1e75843f62543a;p=teleforma.git

Merge branch 'crfpa' into tc202

Conflicts:
	teleforma/templates/teleforma/course_conference_record.html
---

d0a445299ed2ae593599d0a09a1e75843f62543a