Merge branch 'feature-compute-v2' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 26 Jul 2013 14:30:49 +0000 (17:30 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 26 Jul 2013 14:30:49 +0000 (17:30 +0300)
commitff79a4235a6abf89f188dd1e3db4b6a5decafe9c
tree6b9dff3f8700fa66e607290152ab87a13cb1348a
parent703d7a77d790be1a7e9cde0ed726d8fe8240070e
parent67a42d8275f20c9d871a532fb264452ddf280eda
Merge branch 'feature-compute-v2' into develop