Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django

author olivier larcheveque <olivier.larcheveque@u-ol.(none)>

Fri, 29 Oct 2010 20:11:57 +0000 (16:11 -0400)

committer olivier larcheveque <olivier.larcheveque@u-ol.(none)>

Fri, 29 Oct 2010 20:11:57 +0000 (16:11 -0400)
author olivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 29 Oct 2010 20:11:57 +0000 (16:11 -0400)
committer olivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 29 Oct 2010 20:11:57 +0000 (16:11 -0400)
diff --cc auf_savoirs_en_partage/media/css/global.css
Simple merge
author	olivier larcheveque <olivier.larcheveque@u-ol.(none)>
	Fri, 29 Oct 2010 20:11:57 +0000 (16:11 -0400)
committer	olivier larcheveque <olivier.larcheveque@u-ol.(none)>
	Fri, 29 Oct 2010 20:11:57 +0000 (16:11 -0400)