Merge branch 'master' into debian-master
Merge branch 'master' into debian-master
Merge branch 'master' into debian-master
Merge branch 'master' into debian-master
Merge branch 'hotfix-0.11.3' into debian-master
Merge branch 'debian-master' of https://code.grnet.gr/git/kamaki into debian-master
Merge branch 'master' into debian-master
Adjust build-deps for objpool and astakosclient
Typo in build-deps
Merge branch 'master' into debian-master

Conflicts:
	kamaki/clients/utils/__init__.py
Merge branch 'master' into debian-master
Merge remote-tracking branch 'origin/master' into debian-master
Merge branch 'debian-master' into debian-wheezy

Conflicts:
	debian/control
	kamaki/clients/utils/__init__.py