From ebccf13c4c883e1438f4446d6aeba070ce6ee967 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 14 Mar 2012 11:02:14 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  fix in nav
  add links to home, profile, photos, events, notes to aside in network-stream

* master: