From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 29 Dec 2014 19:50:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8a98440db6454fc8653c264f61502bd0d1d6baf8?hp=04596b5a37cb486467c5c2fe2d06a822a6fe6a79

Merge branch 'master' of ssh://git.ikiwiki.info
---

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index 37968e096..17599e050 100644
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -19,6 +19,7 @@ Thanks to the following people for their kind contributions:
 * Amitai Schlair
 * Luca Capello
 * Patrick ZAJDA
+* Fergus Cameron
 
 (Note that this page is locked to prevent anyone from tampering with the PayPal link.
 If you prefer your donation *not* be listed here, let [[Joey]] know.)