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)
commit4927b737f1b26b262ab86f56d5e1ab0b7d8ca910
tree588823e693c8b7f146adf3d60a9b689a60b3d264
parent6f9923c9b8f39746b0f3145da671d4bb919b0121
parent9d3584756cbef1dfddb7f2079b9d609e874e17c0
Merge branch 'dev' into test
buildout.cfg