OCD commit
Merge branch 'master' of github.com:grnet/ganetimgr