Added by Stavros Sachtouris about 10 years ago
Merge branch 'develop' of https://code.grnet.gr/git/kamaki into develop