Merge remote-tracking branch 'origin/libcloud'
authorŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:26:24 +0000 (17:26 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Tue, 24 Jan 2012 16:26:24 +0000 (17:26 +0100)
commit906a64af5cfe4b62e24af88b409a479964677975
tree723a65749d4293b3ceb8bee135fe3611c79ddd99
parent8a602b4a0269f1b8177e54baee486a78ddf23197
parentbc001ee82c721b92c460867aa612362b76dfcf75
Merge remote-tracking branch 'origin/libcloud'

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

Both files reverted back to master.