Merge branch 'master' into debian astakos/debian/v0.6.2
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 12 Jun 2012 14:55:46 +0000 (17:55 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 12 Jun 2012 14:55:46 +0000 (17:55 +0300)
commit2b1567cd777d1fe4ea965e9f169ad57f8b07f053
tree367cdf33f7a73514d4a9d45337131930e017299a
parenteae43f125cdf426351a7ad16465499060aded7b1
parent2ade5df1c6a09b514f3a266616d8ef43a0d8ef06
Merge branch 'master' into debian