Merge remote-tracking branch 'origin/helloworld'
authorŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:22:36 +0000 (17:22 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:22:36 +0000 (17:22 +0100)
commit9eedf794c12179fd6b02415e608af93a413a47be
treea2d162d6f99485cfa7b5045df15df4a2c0c8d493
parent077ed704706c0ddbf4dbe8afc2c224ffce53b8b3
parent4675697f815834863c44355a2143fa9779149f3c
Merge remote-tracking branch 'origin/helloworld'

Conflicts:
software/erp5/software.cfg
software/erp5testnode/software.cfg

Both files reverted back to master.