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

author davin baragiotta <davin.baragiotta@u-db.(none)>

Thu, 7 Oct 2010 19:47:47 +0000 (15:47 -0400)

committer Davin BARAGIOTTA <davin.baragiotta@auf.org>

Thu, 7 Oct 2010 19:47:47 +0000 (15:47 -0400)
author davin baragiotta <davin.baragiotta@u-db.(none)>
Thu, 7 Oct 2010 19:47:47 +0000 (15:47 -0400)
committer Davin BARAGIOTTA <davin.baragiotta@auf.org>
Thu, 7 Oct 2010 19:47:47 +0000 (15:47 -0400)
diff --cc auf_savoirs_en_partage/media/css/global.css
Simple merge
author	davin baragiotta <davin.baragiotta@u-db.(none)>
	Thu, 7 Oct 2010 19:47:47 +0000 (15:47 -0400)
committer	Davin BARAGIOTTA <davin.baragiotta@auf.org>
	Thu, 7 Oct 2010 19:47:47 +0000 (15:47 -0400)