Merge branch 'hotfix-0.12.5' 0.12.5
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 10 Jan 2014 11:10:20 +0000 (13:10 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 10 Jan 2014 11:10:20 +0000 (13:10 +0200)
commit367c2b318f88ad3eb84a2fbbfa7e2e31139a6dc3
tree6a06a0f7bcc4187fcb1f42c9d8d7bbb42098d441
parent567a88c28d6c33e77f80a3fbcc42c8d4744b76f5
parent04128bb9974cacae0d3081804a6f37c3f9940e6b
Merge branch 'hotfix-0.12.5'