Merge branch 'master' of https://code.grnet.gr/git/aquarium
authorProdromos Gerakios <pgerakios@grnet.gr>
Fri, 17 Aug 2012 05:48:42 +0000 (08:48 +0300)
committerProdromos Gerakios <pgerakios@grnet.gr>
Fri, 17 Aug 2012 05:48:42 +0000 (08:48 +0300)

Trivial merge