Make makerepo set the Git merge remote

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

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4f5510e390722d3160819083c421ec3fc940f873..d3d0d6f721e8b0a57f82b163604b2b98ba887b0c 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -28,6 +28,9 @@ 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
 ========================
 
 Personal sites and blogs
 ========================


@@ -55,10 +58,6 @@ Personal sites and blogs
 * [Keith Packard's homepage and blog](http://keithp.com/).
 * [Christian Mock's homepage](http://www.tahina.priv.at/).
 * [Choffee](http://choffee.co.uk/).
 * [Keith Packard's homepage and blog](http://keithp.com/).
 * [Christian Mock's homepage](http://www.tahina.priv.at/).
 * [Choffee](http://choffee.co.uk/).

-* [Generic viagra](http://www.pharmalinerx.com/).
-* [Buy cialis](http://www.divadrugs.com/).
-* [Buy Viagra](http://sunpillrx.com/).
-* [Buy Cialis online](http://dionpills.org/).

 * [Tales from the Gryphon](http://www.golden-gryphon.com/blog/manoj/), Manoj Srivastava's free software blog.
 * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/)
 * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall
 * [Tales from the Gryphon](http://www.golden-gryphon.com/blog/manoj/), Manoj Srivastava's free software blog.
 * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/)
 * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall


@@ -74,9 +73,6 @@ Personal sites and blogs
 * [Effective Programming](http://effectiveprogramming.com/)
 * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
 * [Chez Fred](http://fred.ccheznous.org)
 * [Effective Programming](http://effectiveprogramming.com/)
 * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
 * [Chez Fred](http://fred.ccheznous.org)

-* [Cialis Online](http://www.loskhealth.com/)
-* [Mp3 Download](http://www.atakamus.com/)
-* [Mp3 songs Download](http://www.ihotmusic.net/)

 * [Cameron Dale](http://www.camrdale.org/)
 * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki 
   [asciidoc plugin](http://mowson.org/karl/colophon/).
 * [Cameron Dale](http://www.camrdale.org/)
 * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki 
   [asciidoc plugin](http://mowson.org/karl/colophon/).


@@ -91,6 +87,8 @@ 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)

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