Merge branch 'master' of https://code.grnet.gr/git/astakos astakos/v0.3.6
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 15 Mar 2012 12:58:35 +0000 (14:58 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 15 Mar 2012 12:58:35 +0000 (14:58 +0200)

Trivial merge