Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 24 May 2011 18:53:48 +0000 (14:53 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Tue, 24 May 2011 18:53:48 +0000 (14:53 -0400)
commitadf8ffc1a3360656e6d5bb2f2824a6241459e968
treef75e4c64fa5a71a481a808b8b9f5c3db9f0e858f
parentc942b90d020c63a9561d0404aac8fbdc56cc47a7
parent3420143c55e405a316ea33c170a9305e49e39d54
Merge branch 'dev' into test
buildout.cfg