From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 28 Feb 2012 02:08:19 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cf7e141055fe0028a56bfca64d8e0646c5470863;p=friendica.git

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

* remotes/upstream/master:
  cleanup notify subject lines

* master:
---

cf7e141055fe0028a56bfca64d8e0646c5470863