Merge branch 'dev' of git.auf.org:auf_savoirs_en_partage_django into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 18 Apr 2012 18:56:48 +0000 (14:56 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 18 Apr 2012 18:56:48 +0000 (14:56 -0400)
commit68d2688e2858411881e10f597664bb3d48489c04
tree2a596347ff202c8c65644a750668c15b02bbbf23
parent31249cf3e0e07717f5108e70bd7fd9cbd3967642
parent15cdc70a3733b7283b07898c1b6ecfc9c346e478
Merge branch 'dev' of git.auf.org:auf_savoirs_en_partage_django into dev

Conflicts:
auf_savoirs_en_partage/urls.py
auf_savoirs_en_partage/urls.py