Merge branch 'develop' into feature-output
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 4 Jan 2013 11:36:07 +0000 (13:36 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 4 Jan 2013 11:36:07 +0000 (13:36 +0200)

Trivial merge