Merge branch 'dev' of /var/git/teleforma into ae

author Guillaume Pellerin <yomguy@parisson.com>

Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)

committer Guillaume Pellerin <yomguy@parisson.com>

Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)
author Guillaume Pellerin <yomguy@parisson.com>
Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)
committer Guillaume Pellerin <yomguy@parisson.com>
Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)
diff --cc teleforma/templates/teleforma/course_media.html
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Wed, 7 Nov 2012 11:29:09 +0000 (12:29 +0100)