From: Tom Marble <tmarble@info9.net>
Date: Mon, 13 Jan 2014 03:59:48 +0000 (-0600)
Subject: Merge branch 'master' of sept.info9.net:wiki
X-Git-Url: https://info9.net/gitweb/?p=wiki.git;a=commitdiff_plain;h=724b5625267ad3e8f36d07b5458baefe4374c323;hp=1eaa6a7b5f8d3fd7e156d50b9644d08b5f03aabb

Merge branch 'master' of sept.info9.net:wiki
---

diff --git a/NEW b/NEW
index 31ba73c..dd41456 100644
--- a/NEW
+++ b/NEW
@@ -4,4 +4,4 @@ Here is an experment of the post-update hook
 
 Added by ikiwiki <-- here
 
-Now added at ficelle
+Now updated at ficelle