Merge branch 'hotfix-0.12.10' master 0.12.10
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 19 Feb 2014 12:54:03 +0000 (14:54 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 19 Feb 2014 12:54:03 +0000 (14:54 +0200)
commit2632294b688a119646c249a0852496472433826f
treea6d1f5a8b0469efe7faf5177bcee64dbea05d4b4
parent31e9ee9ee6272b7c803504fbe05beb046d3b5e9a
parentfad7a60c6876b5d082bb26c12b9fb8fb42890a4f
Merge branch 'hotfix-0.12.10'