Merge branch 'develop' of https://code.grnet.gr/git/kamaki into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 16 Dec 2013 15:20:24 +0000 (17:20 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 16 Dec 2013 15:20:24 +0000 (17:20 +0200)

Trivial merge