Merge branch 'nilovna' of ssh://git.auf/auf_savoirs_en_partage_django into nilovna
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 22 Feb 2012 18:58:24 +0000 (13:58 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 22 Feb 2012 18:58:24 +0000 (13:58 -0500)
commitc4920ba1c590cf765d9053e596ae1839dc128c8b
treec4f38fd8c0bfd47c0d21601a8162eb3bd8908a60
parenta0d2a45318266ad4007c7ec0eecf89226223c7de
parentcbbc560605875e2982f5a4a04d27139052c81636
Merge branch 'nilovna' of ssh://git.auf/auf_savoirs_en_partage_django into nilovna