Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
authorOlga Brani <olgabrani@grnet.gr>
Tue, 6 Nov 2012 16:19:23 +0000 (18:19 +0200)
committerOlga Brani <olgabrani@grnet.gr>
Tue, 6 Nov 2012 16:19:23 +0000 (18:19 +0200)

Trivial merge