Merge branch 'feature-adjust-functional-tests' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 13 Jun 2013 15:38:51 +0000 (18:38 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 13 Jun 2013 15:38:51 +0000 (18:38 +0300)

Trivial merge