From aed15dd8e912b8fcde4c7a3efd639de704174184 2014-01-10 13:58:23
From: Joar Wandborg <joar@wandborg.se>
Date: 2014-01-10 13:58:23
Subject: [PATCH] Merge branch 'master' of oak.sfconservancy.org:npo-acct

Conflicts:
	ikiwiki/directive.mdwn

---