Merge branch 'feature-cluster' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 8 Oct 2013 14:00:30 +0000 (17:00 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 8 Oct 2013 14:00:30 +0000 (17:00 +0300)

Trivial merge