Merge branch 'hotfix-0.12.4' 0.12.4
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 9 Jan 2014 12:38:04 +0000 (14:38 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 9 Jan 2014 12:38:04 +0000 (14:38 +0200)
commit567a88c28d6c33e77f80a3fbcc42c8d4744b76f5
tree5aeac7e67784ab96baffb772d15cf58a524ee145
parentdc5cabf298b365f05d0f0b91e806d1f322eb2392
parent3f36ba1dc127872960a9022b1f96882dcd640519
Merge branch 'hotfix-0.12.4'