Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki

diff --git a/ContactInformation b/ContactInformation
index c27b2f9620fa89ade0a02ee849007e2d8d50e9a3..24f8c25eab7976cd004e44b6b6ec41f86789e214 100644 (file)
--- a/ContactInformation
+++ b/ContactInformation
@@ -36,3 +36,5 @@ Via Ventiquattro Maggio, 14
 50129 Firenze
 ITALY
 }}}
+
+<a href="http://www.codewiz.org/pub/potpot.php"><span style="display: none;">prenuptial-definition</span></a>
\ No newline at end of file

diff --git a/FrontPage b/FrontPage
index 4ddc4856213d7d60b8647f852cd68b11704b0333..54ded251c82ed6e93e8de2d8e2994e7b2ab5950d 100644 (file)
--- a/FrontPage
+++ b/FrontPage
@@ -29,8 +29,6 @@ Tags:
  * [[BeRTOS]] -- A microkernel for small embedded systems
  * GeekiGeeki -- The tiny, Git-powered wiki engine
  * LinuxProjects -- Misc Linux projects
- * ???
- * WorldDomination!
 
  * OldProjects