Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
authorolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Thu, 28 Oct 2010 19:28:15 +0000 (15:28 -0400)
committerolivier larcheveque <olivier.larcheveque@u-ol.(none)>
Thu, 28 Oct 2010 19:28:15 +0000 (15:28 -0400)
commit62813435198cdbb10230a1ced268ac2726356907
tree39073b2f5919bb08010ed60a6b23a90e9158f28b
parent1e28a70a3f0bc36ba7663872a36a06235b7ca7ee
parent878de34108151f54de45b000d890a6c405e74cec
Merge branch 'master' of ssh://gitosis@git.auf/auf_savoirs_en_partage_django
auf_savoirs_en_partage/templates/container_base.html
auf_savoirs_en_partage/urls.py