From: Alex Dehnert <adehnert@mit.edu>
Date: Sat, 15 Dec 2012 10:10:38 +0000 (-0500)
Subject: Merge remote branch 'origin/master'
X-Git-Url: https://www.dehnerts.com/gitweb/?p=user%2Falex%2Fsoftware%2Fmy-snippets.git;a=commitdiff_plain;h=9f06bbe848d18e0b2305b6c06f70716e9587d1be

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
---

9f06bbe848d18e0b2305b6c06f70716e9587d1be