Merge branch 'master' of https://code.grnet.gr/git/snf-occi
authornasia <nassia.a@gmail.com>
Fri, 10 Jan 2014 17:25:19 +0000 (19:25 +0200)
committernasia <nassia.a@gmail.com>
Fri, 10 Jan 2014 17:25:19 +0000 (19:25 +0200)
commit27eb5ce9d727fb01b77a7e2cf5d175aecd9b9555
tree8778793b42b85417eaf9aef10b4485b024c4bc80
parent236293c073fac096cef438e5f37603f514c0ca70
parentd7c70e5cba7fad5e1d2bf527c6385e9fc0633dac
Merge branch 'master' of https://code.grnet.gr/git/snf-occi