Merge branch 'dev' of ssh://git.auf/auf_savoirs_en_partage_django into dev
authorDavin Baragiotta <davin.baragiotta@auf.org>
Fri, 30 Sep 2011 20:36:55 +0000 (16:36 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 30 Sep 2011 20:36:55 +0000 (16:36 -0400)
1  2 
buildout.cfg

diff --cc buildout.cfg
Simple merge