Merge remote branch 'origin/master'
authorAlex Dehnert <adehnert@mit.edu>
Sat, 15 Dec 2012 10:10:38 +0000 (05:10 -0500)
committerAlex Dehnert <adehnert@mit.edu>
Sat, 15 Dec 2012 10:10:38 +0000 (05:10 -0500)
commit9f06bbe848d18e0b2305b6c06f70716e9587d1be
tree0160c0a1bd06d59dd1a65e182ea564a0f14307cf
parent2e07c0b3ed005cf2b5a5be571833bc65e0de1b76
parentc1f6b323bf0278a7305b628efb7c35d0b0d8432a
Merge remote branch 'origin/master'

* origin/master:
  mail-merge: remind people to cd to the examples
  ldapfinger: show how to use ldaps and ldap-too
  Instructions for using mail-merge
  Install scripts read-only
  Update Makefile and README to reflect removed scripts
  Remove list-members
  Remove check-host script
  Remove card-access script
  Optionally show queries used in list-of-lists-updater
  Remove pag-screen, since it's maintained elsewhere
  Add sendmail-based mail merger
  Refactor out the actual mail-sending