Merge branch 'develop' of https://code.grnet.gr/git/kamaki into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 2 Apr 2013 10:44:15 +0000 (13:44 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 2 Apr 2013 10:44:15 +0000 (13:44 +0300)

Trivial merge