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

[git.ikiwiki.info.git] / doc / ikiwikiusers.mdwn

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index bf2ade8831545d5760acbef96d29d9a6815dceb5..a9d9ebc0a5122a4b28f9fab029b77a26469365f2 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -28,13 +28,16 @@ Projects
 * [CampusGrün Hamburg](http://www.campusgruen.org/)
 * The [awesome window manager homepage](http://awesome.naquadah.org/)
 * [Enemies of Carlotta](http://www.e-o-c.org/)
 * [CampusGrün Hamburg](http://www.campusgruen.org/)
 * The [awesome window manager homepage](http://awesome.naquadah.org/)
 * [Enemies of Carlotta](http://www.e-o-c.org/)

+* [vcs-pkg](http://vcs-pkg.org)
+* [vcs-home](http://vcs-home.madduck.net)
+* [GNU Hurd wiki](http://www.bddebian.com/~wiki/)

 
 Personal sites and blogs
 ========================
 
 * [[Joey]]'s [homepage](http://kitenet.net/~joey/), including his weblog
 * [Kyle's MacLea Genealogy wiki](http://kitenet.net/~kyle/family/wiki) and [Livingstone and MacLea Emigration Registry](http://kitenet.net/~kyle/family/registry)
 
 Personal sites and blogs
 ========================
 
 * [[Joey]]'s [homepage](http://kitenet.net/~joey/), including his weblog
 * [Kyle's MacLea Genealogy wiki](http://kitenet.net/~kyle/family/wiki) and [Livingstone and MacLea Emigration Registry](http://kitenet.net/~kyle/family/registry)

-* [Ulrik's small collection of small apps](http://www.student.lu.se/~cif04usv/wiki/)
+* [Ulrik's personal web page](http://users.student.lth.se/f04us/wiki/)

 * [kite](http://kitenet.net)
 * [Paul Collins's as-yet purposeless wiki](http://wiki.ondioline.org/)
 * [Andre Luis Lopes's personal website](http://www.andrelop.org/). Brazilian Portuguese only
 * [kite](http://kitenet.net)
 * [Paul Collins's as-yet purposeless wiki](http://wiki.ondioline.org/)
 * [Andre Luis Lopes's personal website](http://www.andrelop.org/). Brazilian Portuguese only


@@ -44,7 +47,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/)
 * [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 personal wiki](http://wiki.subvert.org.uk/).
+* Ben A'Lee's [homepage](http://subvert.org.uk/~bma/) and [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/)
 * [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/)


@@ -84,6 +87,9 @@ Personal sites and blogs
 * [Martin's PhD wiki](http://phd.martin-krafft.net/wiki)
 * [David Riebenbauer's page](http://liegesta.at/)
 * [Thomas Harning's 'eHarning' wiki](http://www.eharning.us/wiki/)
 * [Martin's PhD wiki](http://phd.martin-krafft.net/wiki)
 * [David Riebenbauer's page](http://liegesta.at/)
 * [Thomas Harning's 'eHarning' wiki](http://www.eharning.us/wiki/)

+* [David Bremner's blog](http://www.cs.unb.ca/~bremner/wiki/blog)
+* [madduck's (new) homepage](http://madduck.net)
+* [Olivier Berger's professional homepage](http://www-public.it-sudparis.eu/~berger_o/)

 
 Please feel free to add your own ikiwiki site!
 
 
 Please feel free to add your own ikiwiki site!