Merge commit 'jrollins/master'

diff --git a/doc/george/changelog b/doc/george/changelog
index 0790f65bf309bcbf88104e51dd5878a612e1f3c1..7f1d5eb4340d38f91c0d8352a8eb4cc10c10ebf6 100644 (file)
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,11 @@
 *  changes to this system (first command at top, last at bottom)             *
 ******************************************************************************
 
+2008-08-16 - jrollins
+       * removed stale branches from jrollins from the master repo
+       * aptitude update && aptitude full-upgrade
+       * restarted services to clear up dependencies on old libraries
+       
 2008-08-13 - dkg
        * aptitude update && aptitude full-upgrade
        * restarted services to clear up dependencies on old libraries

diff --git a/website/index.mdwn b/website/index.mdwn
index 8ff984dd81250bb2cd989bd7c88bff88fbe72f0c..495d963746fce9c177b975a9adafaa98d5581b8d 100644 (file)
--- a/website/index.mdwn
+++ b/website/index.mdwn
@@ -9,7 +9,7 @@ yourself and the servers you administer or connect to.  OpenPGP keys
 are tracked via GnuPG, and managed in the `known_hosts` and
 `authorized_keys` files used by OpenSSH for connection authentication.
 
-[[bugs]] | [[download]] | [[news]] | [[documentation|doc]] | [why should i be interested?](/why)
+[why you should be interested](/why) | [[bugs]] | [[download]] | [[news]] | [[documentation|doc]]
 
 ## Conceptual overview ##