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

Trivial merge