Merge branch 'develop' into feature-network-api
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 2 Dec 2013 10:31:35 +0000 (12:31 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 2 Dec 2013 10:31:35 +0000 (12:31 +0200)

Trivial merge