Merge branch 'develop' of https://code.grnet.gr/git/kamaki into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 23 Sep 2013 08:19:15 +0000 (11:19 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 23 Sep 2013 08:19:15 +0000 (11:19 +0300)

Trivial merge