[ckan-changes] [okfn/ckan] ec28b3: [release-v1.6][doc]: Removed merge cruft from inst...

[GitHub]

  Branch: refs/heads/release-v1.6.1
  Home:   https://github.com/okfn/ckan
  Commit: ec28b32429163c3ec034c0dbf20437d40cb5abd6
      https://github.com/okfn/ckan/commit/ec28b32429163c3ec034c0dbf20437d40cb5abd6
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-13 (Tue, 13 Mar 2012)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  [release-v1.6][doc]: Removed merge cruft from install doc.