Merge branch 'hotfix-0.12.2' 0.12.2
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 20 Dec 2013 13:41:50 +0000 (15:41 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 20 Dec 2013 13:41:50 +0000 (15:41 +0200)
commit2f68a8984cffd2c08e3891a398b5aca85eb248b2
treeb63f7fc7347a6e6e41e325232a9859129453fba5
parent2320de66e2bcfebe773835531a24562b1e598cb0
parentf557e9441a07681baafeb272dabede1ec60cfc92
Merge branch 'hotfix-0.12.2'