Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index a156a4af67a198663b620dfe69b9fa4452cde7fb..4808e57181a2346d0e48f0ae3fdea15064f56571 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -68,7 +68,7 @@ think about merging them. This is recommended. :-)
   ([browse](http://git.debian.org/?p=users/jo-guest/ikiwiki.git;a=summary))
 * [[timonator]] (unavailable) `git://github.com/timo/ikiwiki.git`
 * [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/`
   ([browse](http://git.debian.org/?p=users/jo-guest/ikiwiki.git;a=summary))
 * [[timonator]] (unavailable) `git://github.com/timo/ikiwiki.git`
 * [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/`

-* nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git`
+* nezmer (unavailable) `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git`

 * [[yds]] `git://github.com/yds/ikiwiki.git`
 * [[pelle]] `git://github.com/hemmop/ikiwiki.git`
 * [[chrismgray]] `git://github.com/chrismgray/ikiwiki.git`
 * [[yds]] `git://github.com/yds/ikiwiki.git`
 * [[pelle]] `git://github.com/hemmop/ikiwiki.git`
 * [[chrismgray]] `git://github.com/chrismgray/ikiwiki.git`


@@ -83,6 +83,8 @@ think about merging them. This is recommended. :-)
 * [[jcflack]] `git://github.com/jcflack/ikiwiki.git`
 * [[users/mjd]] `https://github.com/mjdominus/ikiwiki.git` ([[browse|https://github.com/mjdominus/ikiwiki]])
 * [[users/kjs]] `git://src.kalleswork.net/ikiwiki.git`
 * [[jcflack]] `git://github.com/jcflack/ikiwiki.git`
 * [[users/mjd]] `https://github.com/mjdominus/ikiwiki.git` ([[browse|https://github.com/mjdominus/ikiwiki]])
 * [[users/kjs]] `git://src.kalleswork.net/ikiwiki.git`

+* bfree `git://github.com/bfree/ikiwiki.git`
+* [[users/leg]] `git://at.magma-soft.at/ikiwiki.info`

 
 ## branches
 
 
 ## branches