From: Fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 29 Jan 2013 10:57:53 +0000 (-0500)
Subject: Merge remote branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5f80467a8f83250354cf4d0a4889ae78c03c0146;p=friendica.git

Merge remote branch 'friendica/master'
---

5f80467a8f83250354cf4d0a4889ae78c03c0146