Merge branch 'feature-output' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 17 Jan 2013 12:51:46 +0000 (14:51 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 17 Jan 2013 12:51:46 +0000 (14:51 +0200)

Trivial merge