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

[GitHub]

  Branch: refs/heads/feature-1821-multilingual-extension
  Home:   https://github.com/okfn/ckan
  Commit: 2b0aa8aefdf7d6c73f834cc62db62377a4a04fbb
      https://github.com/okfn/ckan/commit/2b0aa8aefdf7d6c73f834cc62db62377a4a04fbb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  M ckan/config/routing.py
  A ckan/controllers/datastore.py
  R ckan/controllers/webstore.py
  M ckan/lib/i18n.py
  M ckan/logic/validators.py
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  A ckan/tests/functional/test_datastore.py
  R ckan/tests/functional/test_webstore.py
  M doc/conf.py
  A doc/datastore.rst
  M doc/index.rst
  R doc/webstore.rst
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1821-multilingual-extension