[ckan-changes] [okfn/ckan] 3d239c: merge with master branch

[GitHub]

  Branch: refs/heads/enhancement-pep8-controllers
  Home:   https://github.com/okfn/ckan
  Commit: 3d239c55a980c33b8404c8e762d86e1e9b53ab8b
      https://github.com/okfn/ckan/commit/3d239c55a980c33b8404c8e762d86e1e9b53ab8b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_versions.py
    M doc/solr-setup.rst

  Log Message:
  -----------
  merge with master branch