From: Fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 15 Feb 2013 08:17:59 +0000 (-0500)
Subject: Merge remote branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f1a0aeb480542255fd2aae261382a756779b3d98;p=friendica.git

Merge remote branch 'friendica/master'
---

f1a0aeb480542255fd2aae261382a756779b3d98