Merge branch 'master' into packaging
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Jul 2012 15:42:46 +0000 (18:42 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 19 Jul 2012 15:42:46 +0000 (18:42 +0300)
commitba79e26a4a252fc93c77d7042d97bd70b9c2ab3b
tree400d2a115f00dc8d64f19be58d6a5962b78ae315
parentfe72cfc5afedf0c546dfba465b8c403b31fbbc99
parent42214d4ad05707607508c7df4824ca305320f683
Merge branch 'master' into packaging