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

[GitHub]

  Branch: refs/heads/feature-1698-tag-taxonomies
  Home:   https://github.com/okfn/ckan
  Commit: dd19ce6da124ac1340e816909f51d1c72f0f1548
      https://github.com/okfn/ckan/commit/dd19ce6da124ac1340e816909f51d1c72f0f1548
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/forms/group.py
  M ckan/lib/cli.py
  M ckan/lib/dumper.py
  M ckan/lib/hash.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/schema.py
  M ckan/model/package.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/star.png
  M ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/read.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/lib/test_solr_search_index.py
  M ckan/tests/test_plugins.py
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/file-upload.rst
  M doc/index.rst
  M doc/paster.rst
  M doc/solr-setup.rst

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

Conflicts:
	ckan/logic/action/create.py
	ckan/logic/action/delete.py
	ckan/logic/action/update.py