From: Friendika <info@friendika.com>
Date: Sun, 20 Feb 2011 09:42:11 +0000 (-0800)
Subject: Merge branch 'chriscase-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=af0fe4cf422aee9a8fd6b5b5cd422ed0c02e6696;p=friendica.git

Merge branch 'chriscase-master'

Conflicts:
	mod/dfrn_notify.php
---

af0fe4cf422aee9a8fd6b5b5cd422ed0c02e6696