Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
authorroot <root@dev84.dev.grnet.gr>
Fri, 30 Nov 2012 11:32:25 +0000 (13:32 +0200)
committerroot <root@dev84.dev.grnet.gr>
Fri, 30 Nov 2012 11:32:25 +0000 (13:32 +0200)
commit421aeae8b81a67f15e16f857e8eca6359666ca0d
treeea71610e2116d3fce8566d4fadba02fbc35c62a7
parent3b1912f4aba6c3b84420a7f814eeea08a12e1c3d
parent6ed0e4a634caf79cb26bdfa6dd7d020821c9cf25
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13