[ckan-changes] [okfn/ckan] fd95da: Merge branch 'master' into feature-1576-stats-ext-...

Thu Dec 29 20:15:16 UTC 2011

  Branch: refs/heads/feature-1576-stats-ext-into-core
  Home:   https://github.com/okfn/ckan

  Commit: fd95dad7c8e04a26e813a23ef13b803cbba289e5
      https://github.com/okfn/ckan/commit/fd95dad7c8e04a26e813a23ef13b803cbba289e5
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M ckan/controllers/authorization_group.py
  M ckan/controllers/group_formalchemy.py
  M ckan/forms/common.py
  M ckan/forms/group.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/dumper.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/create.py
  A ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/templates/package/read.html
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/misc/test_stats.py
  M ckan/tests/models/test_group.py
  M ckan/tests/test_dumper.py
  M ckanext/stats/stats.py
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-1576-stats-ext-into-core

Conflicts:
	ckanext/stats/stats.py
[merge,from-master,#1576][s]: fairly trivial merge from master.