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

Trivial merge