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)
commit9afb3828abf823fc99fd788b2c06716fea5c68ee
tree29eb91b4d408bccca7b4c1361eab1442cdbc73cd
parent1dc89e3263c70d5e992fdff12e093f30de4b82e4
parent98bab6d56c8f8cd23357ae4141b4baa487d82fac
Merge branch 'dev' into test
buildout.cfg