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

* remotes/upstream/master:
  $name appearing on testbubble items
  testbubble notifications

* master: