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

[GitHub]

  Branch: refs/heads/feature-1698-tag-taxonomies
  Home:   https://github.com/okfn/ckan
  Commit: 5a5f78793d90a4d79aeb575acb10c1ed2b0e44a9
      https://github.com/okfn/ckan/commit/5a5f78793d90a4d79aeb575acb10c1ed2b0e44a9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  R ckan/migration/versions/050_add_tag_vocabulary.py
  A ckan/migration/versions/050_term_translation_table.py
  A ckan/migration/versions/051_add_tag_vocabulary.py
  M ckan/model/__init__.py
  A ckan/model/term_translation.py
  M ckan/plugins/interfaces.py
  M ckan/templates/package/read.html
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-taxonomies

Conflicts:
	ckan/logic/auth/update.py