[ckan-changes] [okfn/ckan] 316f66: Merge branch 'master' of https://github.com/okfn/c...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 316f6615a0ee5e4da2e2341c98955d7e99da042c
      https://github.com/okfn/ckan/commit/316f6615a0ee5e4da2e2341c98955d7e99da042c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 6419864302da0107859d161125fc0535d50c4898
      https://github.com/okfn/ckan/commit/6419864302da0107859d161125fc0535d50c4898
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M doc/index.rst
    A doc/toolkit.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 26c7265dbb840a8e9bb5e0772049b375475df5e7
      https://github.com/okfn/ckan/commit/26c7265dbb840a8e9bb5e0772049b375475df5e7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 60a3194574cfb5c7200958890e24c24354579e33
      https://github.com/okfn/ckan/commit/60a3194574cfb5c7200958890e24c24354579e33
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


Compare: https://github.com/okfn/ckan/compare/f2725f39a1b0...60a3194574cf