Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 2 Aug 2011 18:03:07 +0000 (14:03 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 2 Aug 2011 18:03:07 +0000 (14:03 -0400)
1  2 
buildout.cfg

diff --cc buildout.cfg
Simple merge