[ckan-changes] [okfn/ckan] e798ea: Merge branch 'master' of github.com:okfn/ckan into...

[GitHub]

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: e798eaca6c7f16a72b12abc833aff1d6dfb00ed9
      https://github.com/okfn/ckan/commit/e798eaca6c7f16a72b12abc833aff1d6dfb00ed9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/authz.py
  M ckan/ckan_nose_plugin.py
  M ckan/config/routing.py
  A ckan/controllers/storage.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/update.py
  M ckan/model/__init__.py
  M ckan/model/authz.py
  M ckan/templates/package/new_package_form.html
  A ckan/templates/storage/index.html
  A ckan/templates/storage/success.html
  A ckan/tests/functional/test_storage.py
  A ckan/tests/functional/test_upload.py
  M ckan/tests/models/test_repo.py
  M ckan/tests/test_plugins.py
  M doc/common-error-messages.rst
  M doc/configuration.rst
  A doc/file-upload.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1515-activity-streams