Merge remote-tracking branch 'origin/testnode'
authorŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:35:05 +0000 (17:35 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:35:05 +0000 (17:35 +0100)
commit9d3d5182af49d0d42053073f79e5f33cf7220d44
treed2df62097b39e772327bfc1c8db37b0d9c6e6ce2
parentfd048f1d8fc05826081578e4bdb7e850e9f80d9b
parent6bb1052b7d2698dfe4e87d6e1b4a04bc9dab7f21
Merge remote-tracking branch 'origin/testnode'

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

Both files reverted back to master.