Merge branch 'master' of https://code.grnet.gr/git/astakos
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 28 Feb 2012 14:11:47 +0000 (16:11 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 28 Feb 2012 14:11:47 +0000 (16:11 +0200)

Trivial merge