Merge branch 'erp5-generic' of http://git.erp5.org/repos/slapos into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Wed, 19 Oct 2011 14:31:43 +0000 (16:31 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Wed, 19 Oct 2011 14:31:43 +0000 (16:31 +0200)
commit08f2b352c9e7a240d1be8a9cc61b0deb955a8d88
treeba22d1a25a27ab2219d6be406d8d7da7b5b8ee97
parent4d6144f46c3e10677703cadf9ab207cec5675552
parentc0d260d642d4f192a02b834165807e7d5dcfd4d8
Merge branch 'erp5-generic' of git.erp5.org/repos/slapos into erp5-generic
software/erp5/snippet-master.cfg
software/erp5/software.cfg