Merge branch 'slaposmaster' into erp5testnode
authorŁukasz Nowak <luke@nexedi.com>
Fri, 22 Jul 2011 15:58:24 +0000 (17:58 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 22 Jul 2011 15:58:24 +0000 (17:58 +0200)
commit8f10b8a7fd895ebe68bced9e7185637231db5bb7
tree396362b450e29da3605cc4421994368d78d70c5c
parent02666ca3be51d0a31e19957f3437df80c51ffba0
parent20808621cd91073b1b1be22fb1a19b42faf94c29
Merge branch 'slaposmaster' into erp5testnode
software/erp5testnode/software.cfg