diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-07-19 12:36:01 +0200 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-07-19 12:36:01 +0200 |
| commit | ec965fc92cd41f597c6e8e88584b9a688407c8c6 (patch) | |
| tree | 410173c14f66ae62a6436ea00b73bb470c9d1dda /doc/tipjar.mdwn | |
| parent | 86edd73d169600875a10a635ef8df4a644545b0d (diff) | |
| parent | fa2c3a3dba2a4589b63cf445ec9e33ec19be627e (diff) | |
| download | ikiwiki-ec965fc92cd41f597c6e8e88584b9a688407c8c6.tar ikiwiki-ec965fc92cd41f597c6e8e88584b9a688407c8c6.tar.gz | |
Merge branch 'master' into po
Conflicts:
debian/changelog
Diffstat (limited to 'doc/tipjar.mdwn')
| -rw-r--r-- | doc/tipjar.mdwn | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn index e678053bb..787df9bf7 100644 --- a/doc/tipjar.mdwn +++ b/doc/tipjar.mdwn @@ -12,6 +12,7 @@ Thanks to the following people for their kind contributions: * Adam Shand * Martin Krafft * Paweł Tęcza +* Mick Pollard (Note that this page is locked to prevent anyone from tampering with the PayPal button. If you prefer your donation *not* be listed here, let [[Joey]] know.) |