Merge branch 'master' into packaging
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 21 Feb 2012 13:02:26 +0000 (15:02 +0200)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 21 Feb 2012 13:02:26 +0000 (15:02 +0200)
commit3ccdbf8bfaf87b84c55025a9cc463f60ed070118
tree3a5a4b8f329e8b27480858430208cf5f7ff5061f
parent141380dfea2ba65cf5ae3dbb162c13d2e84f2b0b
parentb7a645c18de235c7dc4fe7d808e7a0c64b3adbbc
Merge branch 'master' into packaging