Merge branch 'nilovna' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 22 Feb 2012 18:17:52 +0000 (13:17 -0500)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Wed, 22 Feb 2012 18:17:52 +0000 (13:17 -0500)
commitcc01faf357320c4ad6b727963c77f2b0616e7eb1
tree72bf86ce3fc3c1c0a249073d3c1d73e19bedeb31
parent68eafe9e9b8c2b70f644f2f5065aa02e9244a977
parentcbbc560605875e2982f5a4a04d27139052c81636
Merge branch 'nilovna' into test
auf_savoirs_en_partage/chercheurs/api.py