Merge branch 'hotfix-0.12.7' 0.12.7
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 13 Jan 2014 15:27:11 +0000 (17:27 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 13 Jan 2014 15:27:11 +0000 (17:27 +0200)
commit5bd75cb6fb356d343177563600ea21b39e41f1a5
treea2cd769dd009ae59b0db33c39e4c43973863cb98
parent5e8078d822d6db11cf36343ef9bd0958f91a1a42
parent3a19099873556641139fc22c7400d0ad8c12f30d
Merge branch 'hotfix-0.12.7'