Merge branch 'hotfix-0.12.1' 0.12.1
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 18 Dec 2013 15:18:16 +0000 (17:18 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Wed, 18 Dec 2013 15:18:16 +0000 (17:18 +0200)
commit2320de66e2bcfebe773835531a24562b1e598cb0
treea84619e023f4546f75853ab335e0025eff376469
parent81cf516b0da5f62cd2087a849a905ac2c508a6b2
parent39a608cab9cf20dbd1b6ba5e4e908532a33ba7b1
Merge branch 'hotfix-0.12.1'