Merge branch 'feature-tests' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 22 Mar 2013 13:48:24 +0000 (15:48 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 22 Mar 2013 13:48:24 +0000 (15:48 +0200)

Trivial merge