Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
authorOlga Brani <olgabrani@grnet.gr>
Tue, 4 Dec 2012 09:31:34 +0000 (11:31 +0200)
committerOlga Brani <olgabrani@grnet.gr>
Tue, 4 Dec 2012 09:31:34 +0000 (11:31 +0200)

Trivial merge