Merge branch 'crfpa' into tc202

author Guillaume Pellerin <yomguy@parisson.com>

Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)

committer Guillaume Pellerin <yomguy@parisson.com>

Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)
author Guillaume Pellerin <yomguy@parisson.com>
Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)
committer Guillaume Pellerin <yomguy@parisson.com>
Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)
diff --cc teleforma/models/core.py
Simple merge
diff --cc teleforma/templates/teleforma/course_conference_record.html
Simple merge
diff --cc teleforma/views/core.py
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Tue, 16 Jul 2013 00:12:23 +0000 (02:12 +0200)
		1	2
teleforma/models/core.py	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/templates/teleforma/course_conference_record.html	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/views/core.py	patch \|	diff1 \|	diff2 \|	blob \| history