Merge branch 'develop' into feature-test-argument
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 17 Jul 2013 07:42:32 +0000 (10:42 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 17 Jul 2013 07:42:32 +0000 (10:42 +0300)

Trivial merge