Merge branch 'master' of https://code.grnet.gr/git/snf-occi
authornasia <nassia@alopix.(none)>
Wed, 11 Dec 2013 16:29:34 +0000 (18:29 +0200)
committernasia <nassia@alopix.(none)>
Wed, 11 Dec 2013 16:29:34 +0000 (18:29 +0200)
commitd573d9abf23f8624cd086023119d0c1cddcc8b0d
tree2703991b8ef1fe50d60f587b61fcd75eb3ed147e
parent4ab8bfab356d5d0f523f6cb9747e82795fa6c546
parentb8290c59c1bec81922a025e7d07caec0da00f91c
Merge branch 'master' of https://code.grnet.gr/git/snf-occi