Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
authorSofia Papagiannaki <papagian@gmail.com>
Tue, 4 Dec 2012 13:43:41 +0000 (15:43 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Tue, 4 Dec 2012 13:43:41 +0000 (15:43 +0200)
commit48f1f1de40a08472da79891c501029c848a86109
tree9a2fa57ef5589a4affb90e3ef15448830f6971b3
parent775d5ad7ae705de2acf64319c28610001ed30d42
parent0ea1f32b4ad38a02f942c058f22a5f53faa37d48
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13