From: Michael Prokop <mika@grml.org>
Date: Tue, 29 May 2012 08:52:24 +0000 (+0200)
Subject: Merge branch 'minor_fixes' of https://github.com/evgeni/grml.org into pull-request-4
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=acd4dd27b408f14bc8254b9ec7efd93a0959452a;hp=29939ab00b406178ccec23e223365cc136368ba6;p=grml.org.git

Merge branch 'minor_fixes' of https://github.com/evgeni/grml.org into pull-request-4
---

diff --git a/changelogs/README-grml-2012.05/index.html.tt2 b/changelogs/README-grml-2012.05/index.html.tt2
index 13ba359..1d143e0 100644
--- a/changelogs/README-grml-2012.05/index.html.tt2
+++ b/changelogs/README-grml-2012.05/index.html.tt2
@@ -142,9 +142,9 @@
 
         <p>Many thanks in this release go to (alphabetically) Axel Beckert,
         Charles A. Hewson, ChiCuong HA, Christian Hofstaedtler, Christoph Biedl, Christopher
-        Schramm, Conny Seidel , Csillag Tamas, Florian Apolloner, Frank
+        Schramm, Conny Seidel, Csillag Tamas, Florian Apolloner, Frank
         Prochnow, Heinz Ahrens, Holger Baust, John S.  Skogtvedt, Jordan Uggla,
-        Laurent CARON , Marco d'Itri, Markus Ulrich, Martin Koeppe, Matthias
+        Laurent CARON, Marco d'Itri, Markus Ulrich, Martin Koeppe, Matthias
         Strubel, Michael Hanke, Michael Renner, Michael Schierl, Paul Menzel,
         Pawel azhag Sadkowski, Thomas Arendsen Hein, Thorsten Glaser, Thorsten
         Leemhuis, Timo Boettcher, Tom Oehser, Ulrich Dangel and Vincent McIntyre
diff --git a/download/index.html.tt2 b/download/index.html.tt2
index 4bed8d0..6cb3bc0 100644
--- a/download/index.html.tt2
+++ b/download/index.html.tt2
@@ -231,7 +231,7 @@
 
     <p>The Grml team uses <a href="http://git-scm.com/">git</a> for
     managing software and packages. The repositories are available
-    online at <a href="https://github.com/grml/">Github</a>.</p>
+    online at <a href="https://github.com/grml/">GitHub</a>.</p>
 
     <div style="clear: both;"></div>