Merge branch 'develop' into feature-output
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 8 Jan 2013 15:52:50 +0000 (17:52 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Tue, 8 Jan 2013 15:52:50 +0000 (17:52 +0200)

Trivial merge