Merge branch 'master' of https://code.grnet.gr/git/astakos into cloudbar
authorSofia Papagiannaki <papagian@gmail.com>
Sat, 25 Feb 2012 20:03:32 +0000 (22:03 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Sat, 25 Feb 2012 20:03:32 +0000 (22:03 +0200)

Trivial merge