Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master:
This commit is contained in:
Simon L'nu 2012-03-05 10:17:34 -05:00
parent 965e657c20
commit 3ab7132b64

Diff content is not available