Merge branch 'release-1.5' into debian-release-1.5
Bump version to 1.5~rc1-1~wheezy

Signed-off-by: Stratos Psomadakis <psomas@grnet.gr>
Merge branch 'release-1.5' into debian-release-1.5
Bump version to 1.5~rc2-1~wheezy

Signed-off-by: Stratos Psomadakis <psomas@grnet.gr>
Bump version to 1.5rc3
Prepare for 1.5 release
Merge branch 'release-1.5'
Merge branch 'debian-release-1.5' into debian
Merge branch 'master' into debian
Bump version to 1.5-1~wheezy

Signed-off-by: Stratos Psomadakis <psomas@grnet.gr>
Merge branch 'master' into develop
Fix version
Merge branch 'develop' into debian-develop