Merge branch 'hotfix-0.8.5' 0.8.5
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 7 Jun 2013 13:43:09 +0000 (16:43 +0300)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Fri, 7 Jun 2013 13:43:09 +0000 (16:43 +0300)
commitde98f78a87342d8fda849d9fc86e48f71a9b5747
tree517ef0f02abdd15e5292624251fdb74e9aba6e29
parent269993556ae424b01ac1672e67e38a1929ab07b5
parent0c742ce711fefd7952dfa0bb1fd6f998c04a9ca7
Merge branch 'hotfix-0.8.5'