Merge branch 'feature-semantic-clean-up' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 17 Feb 2014 13:11:25 +0000 (15:11 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 17 Feb 2014 13:11:25 +0000 (15:11 +0200)

Trivial merge