Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
authorolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 17 Sep 2010 20:44:34 +0000 (16:44 -0400)
committerolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Fri, 17 Sep 2010 20:44:34 +0000 (16:44 -0400)
commit547b4493ba8ff789c4620268e7906ab55bfaa3ac
treef05be6a2aac8f83f28fd14ce7a4d6ae39db9d75e
parentf991eb017ec0859797532cce01337db41d41d963
parentafc38ad93a9bf4dea53f9feb845bf4e7b6835b23
Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
auf_savoirs_en_partage/savoirs/globals.py
auf_savoirs_en_partage/settings.py