Merge branch 'feature-network-api' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 29 Nov 2013 14:01:07 +0000 (16:01 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 29 Nov 2013 14:01:07 +0000 (16:01 +0200)

Trivial merge