From 0e9d5e0ce869a75498e1f5eff847b6037d6c1f67 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 16 Mar 2012 18:35:50 -0400
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  wrong link in d* comment notifications

* master: