From: Joey Hess Date: Mon, 3 Dec 2007 19:48:21 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.16~100 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d3e190ecec67ae45891d8aee3e3c8af9fc9f8cf9?hp=e30c3e3bb9c5185382a16e49ce4a6ad86a948efc Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 23c0dde54..1fa26f406 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -25,6 +25,7 @@ Projects * The [pcc](http://pcc.ludd.ltu.se/) (Portable C Compiler) project. (Simple rcs backend) * [The TOVA Company](http://www.tovatest.com) public site. We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend. * Technical support websites for [Homebase](http://support.homebase.dk) and [Kaospilotene](http://support.kaospilot.no) (each with [source](http://source.homebase.dk/) [provided](http://source.kaospilot.no/)) +* [CampusGrün Hamburg](http://www.campusgruen.org/) Personal sites and blogs ======================== @@ -41,7 +42,7 @@ Personal sites and blogs * [Roland Mas's blog](http://roland.entierement.nu/categories/geek-en.html) * [Sergio Talens-Oliag's personal wiki](http://mixinet.net/~sto/) and [blog](http://mixinet.net/~sto/blog.html) * [Christian Aichinger's homepage](http://greek0.net/) -* [Ben A'Lee's homepage](http://bmalee.eu/~bma/) +* [Ben A'Lee's personal wiki](http://wiki.subvert.org.uk/). * [Adam Shand's homepage](http://adam.shand.net/iki/) * [Recai Oktaş's homepage](http://kirkambar.net/) (uses [[rcs/Git]] backend, Turkish language only). * [Hess family wiki](http://kitenet.net/~family/)