Merge branch 'develop' into feature-connection
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 3 Apr 2013 14:43:02 +0000 (17:43 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 3 Apr 2013 14:43:02 +0000 (17:43 +0300)

Trivial merge