Merge branch 'master' of https://code.grnet.gr/git/astakos
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 31 Jul 2012 16:52:02 +0000 (19:52 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 31 Jul 2012 16:52:02 +0000 (19:52 +0300)

Trivial merge