chiark / gitweb /
Revert bogus parts of "Look for master-info-v2.txt not master-info-2.txt"
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Thu, 10 Sep 2009 18:33:06 +0000 (19:33 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Thu, 10 Sep 2009 18:33:06 +0000 (19:33 +0100)
commit068b48ca6de5313177773a1a435b2130a56044ef
treea4f6cb1226502fb5ebb54e555600e8885260099d
parent0e0de455b99b0543128005437b8c931b348edb75
Revert bogus parts of "Look for master-info-v2.txt not master-info-2.txt"

This reverts most of commit c925ba9b2af7a212378a1bb5e9f20697be857523
because that appears to accidentally revert several other changes.

We retain the one intended hunk, in Commods.pm, which had a conflict anyway.

Conflicts:
yarrg/Commods.pm
yarrg/README.privacy
yarrg/web/devel
yarrg/web/intro