Merge branch 'grid-computing' slapos-0.165
authorAlain Takoudjou <talino@tiolive.com>
Fri, 31 May 2013 13:21:32 +0000 (15:21 +0200)
committerAlain Takoudjou <talino@tiolive.com>
Fri, 31 May 2013 13:21:32 +0000 (15:21 +0200)
commit453b326510247046dd9f5a44dc58978ea0e0f5f3
treede23a646678dff7af5c3347bf385a7a5213dfee0
parent67b54a3ddbe96be49ad1bd336a3915ac896ad3ca
parent188d2fa7c2cb1f56a62fa0e279ee40c3bd2503d2
Merge branch 'grid-computing'