Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 12 Aug 2011 15:44:37 +0000 (11:44 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Fri, 12 Aug 2011 15:44:37 +0000 (11:44 -0400)
1  2 
buildout.cfg

diff --cc buildout.cfg
Simple merge