Merge branch 'master' into erp5
authorRomain Courteaud <romain@nexedi.com>
Fri, 14 Oct 2011 15:25:27 +0000 (17:25 +0200)
committerRomain Courteaud <romain@nexedi.com>
Fri, 14 Oct 2011 15:25:27 +0000 (17:25 +0200)
commit53c5932d9000de6d6c44b85af95f930b327c8daa
treebe26d5d249052be07e2546a48850aa4ccf2310c2
parent52ae749a36a626e7dfcad6d5b1bf9ed905788e8f
parentaf93196e7adef53607d1e0e0938fd6043699a86a
Merge branch 'master' into erp5

Conflicts:
component/apache/buildout.cfg
component/groonga/buildout.cfg
component/imagemagick/buildout.cfg
component/mysql-5.1/buildout.cfg
component/ncurses/buildout.cfg
slapos/recipe/erp5/template/haproxy.cfg.in
software/erp5/software.cfg
software/vifib/software.cfg
stack/erp5.cfg
component/apache/buildout.cfg
software/erp5/software.cfg