Merge branch 'master' into slapos
authorŁukasz Nowak <luke@nexedi.com>
Fri, 24 Jun 2011 07:54:33 +0000 (09:54 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 24 Jun 2011 07:54:33 +0000 (09:54 +0200)
commit0a21bdf0074e11beb2bc3dd7d9e8295b80ecc80f
treef6c3d1873702a4a6cac9efe5c7ddd6b220871a70
parentf93cdb1acaa68ce36b05ade72a82fd6a3e729f46
parent8b673159ae3b7d20ac82a63625407755ce698823
Merge branch 'master' into slapos

Conflicts:
software/erp5/software.cfg