[ckan-changes] [okfn/ckan] 970c9b: Fixed merge conflict when cherry picking 68495956d...

[GitHub]

  Branch: refs/heads/release-v1.7.2
  Home:   https://github.com/okfn/ckan
  Commit: 970c9b22b2f7c93e0a0ad5411b49e683df93ac2b
      https://github.com/okfn/ckan/commit/970c9b22b2f7c93e0a0ad5411b49e683df93ac2b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Fixed merge conflict when cherry picking 68495956d19f