Merge branch 'master' into packaging v0.9.2
authorKostas Papadimitriou <kpap@grnet.gr>
Fri, 22 Jun 2012 13:42:22 +0000 (16:42 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Fri, 22 Jun 2012 13:42:22 +0000 (16:42 +0300)
commitfe72cfc5afedf0c546dfba465b8c403b31fbbc99
treed9036638ef58a529d6708bced32586b9395695b9
parenta5f5da3c46fd2c2673c91dde9d00d9dd846e5c9f
parentde40f4d05f1ebd8b527edc32206817f8569ed10d
Merge branch 'master' into packaging