Merge branch 'feature-remove-livetests' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 31 Jan 2014 12:41:27 +0000 (14:41 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 31 Jan 2014 12:41:27 +0000 (14:41 +0200)

Trivial merge