Merge branch 'feature-errors' into develop
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 7 Feb 2013 11:26:44 +0000 (13:26 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 7 Feb 2013 11:26:44 +0000 (13:26 +0200)

Trivial merge