Merge lp://staging/~nataliabidart/magicicada-server/update-copyright-notices into lp://staging/magicicada-server

Makefile (+1/-1)
config-manager.txt (+1/-1)
dev-scripts/_pythonpath.py (+1/-1)
dev-scripts/cmd_client.py (+1/-1)
dev-scripts/deploy_api_server.py (+2/-2)
dev-scripts/dev_launcher.py (+2/-2)
dev-scripts/link-external-sourcecode (+2/-2)
dev-scripts/sd_test.sh (+1/-1)
dev-scripts/set_rlimits.sh (+1/-1)
dev-scripts/start-dbus.sh (+1/-1)
dev-scripts/stop-dbus.sh (+1/-1)
dev-scripts/supervisor-config-dev.py (+1/-1)
dev-scripts/supervisor_templates.py (+1/-1)
dev-scripts/user-mgr.py (+1/-1)
lib/ubuntuone/__init__.py (+1/-1)
lib/ubuntuone/supervisor/__init__.py (+1/-1)
lib/ubuntuone/supervisor/config_helpers.py (+1/-1)
lib/ubuntuone/supervisor/heartbeat_listener.py (+1/-1)
lib/ubuntuone/supervisor/start-supervisord.py (+1/-1)
lib/ubuntuone/supervisor/tests/__init__.py (+1/-1)
lib/ubuntuone/supervisor/tests/test_heartbeat_listener.py (+1/-1)
lib/ubuntuone/supervisor/tests/test_utils.py (+1/-1)
lib/ubuntuone/supervisor/utils.py (+1/-1)
lib/utilities/__init__.py (+1/-1)
lib/utilities/dev_launcher.py (+1/-1)
lib/utilities/localendpoints.py (+1/-1)
lib/utilities/testlib.py (+1/-1)
lib/utilities/utils.py (+1/-1)
magicicada/filesync/__init__.py (+1/-1)
magicicada/filesync/admin.py (+1/-1)
magicicada/filesync/dbmanager.py (+1/-1)
magicicada/filesync/downloadservices.py (+1/-1)
magicicada/filesync/errors.py (+1/-1)
magicicada/filesync/management/commands/user_mgr.py (+1/-1)
magicicada/filesync/managers.py (+1/-1)
magicicada/filesync/models.py (+1/-1)
magicicada/filesync/notifier/__init__.py (+1/-1)
magicicada/filesync/notifier/notifier.py (+1/-1)
magicicada/filesync/notifier/tests/__init__.py (+1/-1)
magicicada/filesync/notifier/tests/test_notifier.py (+1/-1)
magicicada/filesync/resthelper.py (+1/-1)
magicicada/filesync/services.py (+1/-1)
magicicada/filesync/signals.py (+1/-1)
magicicada/filesync/tests/test_admin.py (+1/-1)
magicicada/filesync/tests/test_dao.py (+1/-1)
magicicada/filesync/tests/test_downloadservices.py (+1/-1)
magicicada/filesync/tests/test_gateway.py (+1/-1)
magicicada/filesync/tests/test_models.py (+1/-1)
magicicada/filesync/tests/test_resthelper.py (+1/-1)
magicicada/filesync/tests/test_services.py (+1/-1)
magicicada/filesync/tests/test_utils.py (+1/-1)
magicicada/filesync/utilities/harness.py (+2/-2)
magicicada/filesync/utilities/keyword_script.py (+1/-1)
magicicada/filesync/utilities/make_abundant_files.py (+1/-1)
magicicada/filesync/utils.py (+1/-1)
magicicada/metrics/__init__.py (+1/-1)
magicicada/metrics/services.py (+1/-1)
magicicada/metrics/tests/__init__.py (+1/-1)
magicicada/metrics/tests/test_services.py (+1/-1)
magicicada/monitoring/__init__.py (+1/-1)
magicicada/monitoring/dump.py (+1/-1)
magicicada/monitoring/reactor.py (+1/-1)
magicicada/monitoring/tests/__init__.py (+1/-1)
magicicada/monitoring/tests/test_dump.py (+1/-1)
magicicada/monitoring/tests/test_reactor.py (+1/-1)
magicicada/rpcdb/__init__.py (+1/-1)
magicicada/rpcdb/backend.py (+1/-1)
magicicada/rpcdb/inthread.py (+1/-1)
magicicada/rpcdb/tests/__init__.py (+1/-1)
magicicada/rpcdb/tests/test_backend.py (+1/-1)
magicicada/server/__init__.py (+1/-1)
magicicada/server/auth.py (+1/-1)
magicicada/server/content.py (+1/-1)
magicicada/server/diskstorage.py (+1/-1)
magicicada/server/errors.py (+1/-1)
magicicada/server/integration/__init__.py (+1/-1)
magicicada/server/integration/helpers.py (+1/-1)
magicicada/server/integration/integtests_basic.py (+1/-1)
magicicada/server/integration/integtests_udf.py (+1/-1)
magicicada/server/integration/run_integtests.py (+1/-1)
magicicada/server/integtests/__init__.py (+1/-1)
magicicada/server/integtests/test_action_queue.py (+1/-1)
magicicada/server/integtests/test_aq_cancel.py (+1/-1)
magicicada/server/integtests/test_capabilities.py (+1/-1)
magicicada/server/integtests/test_cleanup.py (+1/-1)
magicicada/server/integtests/test_server_scan.py (+1/-1)
magicicada/server/integtests/test_share_sync.py (+1/-1)
magicicada/server/integtests/test_sync.py (+1/-1)
magicicada/server/integtests/test_udf_sync.py (+1/-1)
magicicada/server/server.py (+1/-1)
magicicada/server/server.tac (+1/-1)
magicicada/server/ssl.py (+1/-1)
magicicada/server/ssl_proxy.py (+1/-1)
magicicada/server/ssl_proxy.tac (+1/-1)
magicicada/server/stats.py (+1/-1)
magicicada/server/testing/__init__.py (+1/-1)
magicicada/server/testing/aq_helpers.py (+1/-1)
magicicada/server/testing/caps_helpers.py (+1/-1)
magicicada/server/testing/testcase.py (+1/-1)
magicicada/server/tests/__init__.py (+1/-1)
magicicada/server/tests/test_account.py (+1/-1)
magicicada/server/tests/test_auth.py (+1/-1)
magicicada/server/tests/test_basic.py (+1/-1)
magicicada/server/tests/test_capabilities.py (+1/-1)
magicicada/server/tests/test_content.py (+1/-1)
magicicada/server/tests/test_diskstorage.py (+1/-1)
magicicada/server/tests/test_fileops.py (+1/-1)
magicicada/server/tests/test_generations.py (+1/-1)
magicicada/server/tests/test_make.py (+1/-1)
magicicada/server/tests/test_notify_delivery.py (+1/-1)
magicicada/server/tests/test_server.py (+1/-1)
magicicada/server/tests/test_sharing.py (+1/-1)
magicicada/server/tests/test_shutdown.py (+1/-1)
magicicada/server/tests/test_ssl_proxy.py (+1/-1)
magicicada/server/tests/test_stats.py (+1/-1)
magicicada/server/tests/test_throttling.py (+1/-1)
magicicada/server/tests/test_udfs.py (+1/-1)
magicicada/server/tests/test_upload.py (+1/-1)
magicicada/server/tests/test_validation.py (+1/-1)
magicicada/server/tests/test_volumes.py (+1/-1)
magicicada/server/upload.py (+1/-1)
magicicada/settings/__init__.py (+1/-1)
magicicada/testing/__init__.py (+1/-1)
magicicada/testing/factory.py (+1/-1)
magicicada/testing/testcase.py (+1/-1)
magicicada/txlog/__init__.py (+1/-1)
magicicada/txlog/models.py (+1/-1)
magicicada/txlog/tests/__init__.py (+1/-1)
magicicada/txlog/tests/test_models.py (+1/-1)
magicicada/txlog/tests/test_utils.py (+1/-1)
magicicada/txlog/utils.py (+1/-1)
magicicada/utils.py (+1/-1)
test (+1/-1)