Merge branch 'master' into debian-0.9
authorKostas Papadimitriou <kpap@grnet.gr>
Tue, 17 Jul 2012 19:13:57 +0000 (22:13 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Tue, 17 Jul 2012 19:13:57 +0000 (22:13 +0300)
commit194963df19114924b2fe4146944de9af1cc8c413
tree04fb4427e49b5eaaf1c790f6027a17b587f24e13
parent96dd3b184e2b050e5dc5ab570026f87588ee17ed
parent9c26045def277c48c450107df0d57df75330c7cc
Merge branch 'master' into debian-0.9