Merge branch 'crfpa' into tc202

author Guillaume Pellerin <yomguy@parisson.com>

Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)

committer Guillaume Pellerin <yomguy@parisson.com>

Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)
author Guillaume Pellerin <yomguy@parisson.com>
Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)
committer Guillaume Pellerin <yomguy@parisson.com>
Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)
diff --cc teleforma/admin.py
Simple merge
diff --cc teleforma/locale/fr/LC_MESSAGES/django.po
Simple merge
diff --cc teleforma/models/core.py
Simple merge
diff --cc teleforma/views/core.py
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Thu, 12 Sep 2013 07:37:41 +0000 (09:37 +0200)
		1	2
teleforma/admin.py	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/locale/fr/LC_MESSAGES/django.po	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/models/core.py	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/views/core.py	patch \|	diff1 \|	diff2 \|	blob \| history