Merge branch 'master' into vifib
authorŁukasz Nowak <luke@nexedi.com>
Mon, 13 Jun 2011 13:52:22 +0000 (15:52 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Mon, 13 Jun 2011 13:52:22 +0000 (15:52 +0200)
commit59fbe1f929d4fc58a0954368d61cbfaf58eb9387
tree246c6ff659b94a59a4068ebb1de402477d5c0354
parentc28467be2f5c8dbf2af2ee34a5d0ca96c3592d53
parent34959dbdf94b1f99d4d23522f765c64450c83043
Merge branch 'master' into vifib

Conflicts:
CHANGES.txt
setup.py
software/erp5/software.cfg
software/erp5testnode/software.cfg
CHANGES.txt
slapos/recipe/erp5/__init__.py