Merge branch 'hotfix-0.8.5' 0.8.5
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 7 Jun 2013 13:43:09 +0000 (16:43 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 7 Jun 2013 13:43:09 +0000 (16:43 +0300)

Trivial merge