Merge branch 'hotfix-0.12.6' 0.12.6
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 13 Jan 2014 13:08:40 +0000 (15:08 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Mon, 13 Jan 2014 13:08:40 +0000 (15:08 +0200)
commit5e8078d822d6db11cf36343ef9bd0958f91a1a42
treeeeb71ed70548cf309457e8f3ddbbeba437d60782
parent367c2b318f88ad3eb84a2fbbfa7e2e31139a6dc3
parent5d7df8922895b9608d2a3e37db855cd262e6b8be
Merge branch 'hotfix-0.12.6'