From: Friendika <info@friendika.com>
Date: Sat, 5 Feb 2011 21:05:57 +0000 (-0800)
Subject: Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8a55168d4f470fb06b2e02896541688d3967bae5;p=friendica.git

Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master
---

8a55168d4f470fb06b2e02896541688d3967bae5