Merge branch 'master' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Mon, 13 Jun 2011 16:29:30 +0000 (18:29 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 13 Jun 2011 16:29:30 +0000 (18:29 +0200)
commite7c338c22506dcb32f2d85f71430d941f3ad25ba
treee835e74e95325ac828200b7e09e20f3e8026459d
parentf1a2c235b944e3ca4db7e3da9c5d4b4b9187e21c
parent34959dbdf94b1f99d4d23522f765c64450c83043
Merge branch 'master' into erp5

Conflicts:
CHANGES.txt
setup.py
software/erp5/software.cfg
software/erp5testnode/software.cfg
CHANGES.txt
component/mysql-5.1/buildout.cfg
slapos/recipe/erp5/__init__.py