Merge pull request #2323 from annando/1601-dfrn-import

author fabrixxm <fabrix.xm@gmail.com>

Mon, 8 Feb 2016 14:48:16 +0000 (15:48 +0100)

committer fabrixxm <fabrix.xm@gmail.com>

Mon, 8 Feb 2016 14:48:16 +0000 (15:48 +0100)
author fabrixxm <fabrix.xm@gmail.com>
Mon, 8 Feb 2016 14:48:16 +0000 (15:48 +0100)
committer fabrixxm <fabrix.xm@gmail.com>
Mon, 8 Feb 2016 14:48:16 +0000 (15:48 +0100)
diff --cc mod/dfrn_notify.php
Simple merge
diff --cc mod/ping.php
Simple merge
author	fabrixxm <fabrix.xm@gmail.com>
	Mon, 8 Feb 2016 14:48:16 +0000 (15:48 +0100)
committer	fabrixxm <fabrix.xm@gmail.com>
	Mon, 8 Feb 2016 14:48:16 +0000 (15:48 +0100)
		1	2
mod/dfrn_notify.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/ping.php	patch \|	diff1 \|	diff2 \|	blob \| history