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

[GitHub]

  Branch: refs/heads/release-v2.0.2
  Home:   https://github.com/okfn/ckan
  Commit: e991eb9c3a6a2d3971d138d5bf4ecdb694a9d3fe
      https://github.com/okfn/ckan/commit/e991eb9c3a6a2d3971d138d5bf4ecdb694a9d3fe
  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