Merge remote-tracking branch 'origin/libcloud-requester'
authorŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:28:58 +0000 (17:28 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:28:58 +0000 (17:28 +0100)
commitc7032ccd78f1fd73a31ae6cb8d1107a4bce6a6b3
treec33a4341fd90fe3073551eb545d6fe3678bd60ac
parent906a64af5cfe4b62e24af88b409a479964677975
parent88daa7d7dd58147f0aaded0d1c6b89fd422c6932
Merge remote-tracking branch 'origin/libcloud-requester'

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

Both files reverted back to master.