-
Christos Stavrakakis authored
Conflicts: Changelog snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/views/target/__init__.py snf-cyclades-app/synnefo/logic/backend.py snf-cyclades-app/synnefo/logic/management/commands/reconcile-servers.py snf-pithos-backend/pithos/backends/lib/sqlalchemy/node.py snf-pithos-backend/pithos/backends/lib/sqlite/node.py
598f4e2f