Merge branch 'master' of ssh://git.auf/auf_savoirs_en_partage_django
authorEric Mc Sween <eric.mcsween@gmail.com>
Fri, 29 Oct 2010 15:26:05 +0000 (11:26 -0400)
committerEric Mc Sween <eric.mcsween@gmail.com>
Fri, 29 Oct 2010 15:26:05 +0000 (11:26 -0400)
commit0e417b857bbdbab1adbc9f7d01ae8cf067ee1d7e
treeaa6ccb4266d4ecc0afee74eff7993b1ccc01cf2b
parent7bbf600c7759fd98db8fd6856543ce1197566401
parent713e8613e0f72d967796ca35c2a80583b9019a70
Merge branch 'master' of ssh://git.auf/auf_savoirs_en_partage_django

Conflicts:
auf_savoirs_en_partage/savoirs/forms.py
auf_savoirs_en_partage/savoirs/forms.py
auf_savoirs_en_partage/savoirs/models.py