Merge branch 'dev' into test
authorOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 30 May 2011 14:03:12 +0000 (10:03 -0400)
committerOlivier Larchevêque <olivier.larcheveque@auf.org>
Mon, 30 May 2011 14:03:12 +0000 (10:03 -0400)
commit6274f63d882a676465ddb4fb8d49bf518c94f227
tree1c0f254fe974149add64953b787918467104e182
parent47fe0a69031722db36a233fcceff035f7aa9e9e4
parentd8cfc3d5147ffe14011c8ed0d75404bd608d7e61
Merge branch 'dev' into test
buildout.cfg