Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev
authorSofia Papagiannaki <papagian@gmail.com>
Thu, 20 Sep 2012 15:11:49 +0000 (18:11 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Thu, 20 Sep 2012 15:11:49 +0000 (18:11 +0300)
commit6d1a8c437152c3b4443edc0153eca7049b093ad1
tree451c76c54d7aba2fc4d0201cc7a68d928b975f57
parent6e52912bcfaf733773e03572dddc4833ad3753f7
parentd5e09ca7e8606167408ed07de8790413cd2c42e9
Merge branch 'dev' of https://code.grnet.gr/git/astakos into dev