Merge branch 'master' of https://code.grnet.gr/git/astakos
authorKostas Papadimitriou <kpap@grnet.gr>
Wed, 28 Mar 2012 09:40:43 +0000 (12:40 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Wed, 28 Mar 2012 09:40:43 +0000 (12:40 +0300)

Trivial merge