Merge branch 'master' of https://code.grnet.gr/git/astakos
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 8 Mar 2012 10:03:50 +0000 (12:03 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 8 Mar 2012 10:03:50 +0000 (12:03 +0200)

Trivial merge