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

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

Fri, 17 Sep 2010 13:54:19 +0000 (09:54 -0400)

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

Fri, 17 Sep 2010 13:54:19 +0000 (09:54 -0400)
author olivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 17 Sep 2010 13:54:19 +0000 (09:54 -0400)
committer olivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 17 Sep 2010 13:54:19 +0000 (09:54 -0400)
diff --cc auf_savoirs_en_partage/savoirs/globals.py
Simple merge
diff --cc auf_savoirs_en_partage/settings.py
Simple merge
author	olivier larcheveque <olivier.larcheveque@u-ol.(none)>
	Fri, 17 Sep 2010 13:54:19 +0000 (09:54 -0400)
committer	olivier larcheveque <olivier.larcheveque@u-ol.(none)>
	Fri, 17 Sep 2010 13:54:19 +0000 (09:54 -0400)
		1	2
auf_savoirs_en_partage/savoirs/globals.py	patch \|	diff1 \|	diff2 \|	blob \| history
auf_savoirs_en_partage/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history