[ckan-changes] [okfn/ckan] d6de1a: Merge branch 'master' into feature-1515-activity-s...

[GitHub]

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: d6de1ad51a9ee3aac5b0dc6715093de70761f390
      https://github.com/okfn/ckan/commit/d6de1ad51a9ee3aac5b0dc6715093de70761f390
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    A bin/canada.py
  A bin/status.py
  M ckan/config/deployment.ini_tmpl
  M ckan/lib/app_globals.py
  M ckan/lib/cli.py
  M ckan/logic/action/get.py
  M ckan/model/authz.py
  A ckan/public/images/icons/ckan.ico
  M ckan/templates/layout_base.html
  M ckan/tests/functional/api/test_action.py
  A ckan/tests/lib/test_cli.py
  M doc/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1515-activity-streams