projects
/
grml.org.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into nonophp
[grml.org.git]
/
team
/
index.html.tt2
diff --git
a/team/index.html.tt2
b/team/index.html.tt2
index
b1df04f
..
4ac9baf
100644
(file)
--- a/
team/index.html.tt2
+++ b/
team/index.html.tt2
@@
-34,7
+34,6
@@
<li>Andreas Gredler (jimmy)</li>
<li>Christian Hofstaedtler (ch)</li>
<li>Frank Terbeck (ft)</li>
<li>Andreas Gredler (jimmy)</li>
<li>Christian Hofstaedtler (ch)</li>
<li>Frank Terbeck (ft)</li>
- <li>Gerfried Fuchs (rhonda)</li>
<li>Michael Prokop (mika)</li>
<li>Ulrich Dangel (mru)</li>
</ul>
<li>Michael Prokop (mika)</li>
<li>Ulrich Dangel (mru)</li>
</ul>
@@
-58,6
+57,7
@@
<li>Carsten Hey</li>
<li>Christoph Biedl</li>
<li>Eduard Bloch</li>
<li>Carsten Hey</li>
<li>Christoph Biedl</li>
<li>Eduard Bloch</li>
+ <li>Gerfried Fuchs</li>
<li>Gregor Perner</li>
<li>Jan-Pieter Jacobs</li>
<li>Jens Kubieziel</li>
<li>Gregor Perner</li>
<li>Jan-Pieter Jacobs</li>
<li>Jens Kubieziel</li>