Merge remote-tracking branch 'origin/sheepdogtestbed'
authorŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:33:23 +0000 (17:33 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:33:23 +0000 (17:33 +0100)
commitfd048f1d8fc05826081578e4bdb7e850e9f80d9b
tree86c577ad9b070c856bca37e54018f1b7a087a444
parente86095ac066b003c39503349e913626b39b9299d
parentafd56e5f9bc03967e651eaf241ab851dc579a799
Merge remote-tracking branch 'origin/sheepdogtestbed'

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

Both files reverted back to master.