From: Bernie Innocenti <bernie@codewiz.org>
Date: Wed, 17 Nov 2010 14:58:21 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=87b7a9bf65501ec9affcf1c00f4b50d2149448c2;hp=b5ff9acceae2dae3883fc19d260f3a4895e30c7e;p=wiki.git

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

diff --git a/ContactInformation b/ContactInformation
index c27b2f9..24f8c25 100644
--- 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 4ddc485..54ded25 100644
--- 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