Merge branch 'develop' into release-0.7
authorStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 21 Feb 2013 15:19:58 +0000 (17:19 +0200)
committerStavros Sachtouris <saxtouri@admin.grnet.gr>
Thu, 21 Feb 2013 15:19:58 +0000 (17:19 +0200)
commit4098d3fe85089ddf98dc14f7d378b16ed3f25477
treec2e3c3a122e85894eecb79c30b8a0532ae6b3079
parent928c2be3a075e8e7bbf89fab713b88225f8a4ac9
parent5b879b161adeec2dc37c824f6c3016661d9b3912
Merge branch 'develop' into release-0.7

Conflicts:
version
version