[ckan-changes] [okfn/ckan] aa96e8: [#1062] Toby is stupid

[GitHub]

  Branch: refs/heads/release-v2.1
  Home:   https://github.com/okfn/ckan
  Commit: aa96e8654ce5d9465768979e65577367fda64a0b
      https://github.com/okfn/ckan/commit/aa96e8654ce5d9465768979e65577367fda64a0b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/footer.html
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [#1062] Toby is stupid

Conflicts:

	ckan/templates/admin/config.html
	ckan/templates/admin/index.html
	ckan/templates/footer.html
	ckan/templates/package/search.html