From eae6418074d8c2addf85acf11e8f83165b847d04 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 3 Mar 2012 19:24:54 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  tag fix
  fix
  navbar fix

* master: