From: Fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 28 Sep 2012 14:06:00 +0000 (-0400)
Subject: Merge remote branch 'friendica/master' into quattro-fontsoptions
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=574631c17a3e8289e363d74e69f70140ad035000;p=friendica.git

Merge remote branch 'friendica/master' into quattro-fontsoptions
---

574631c17a3e8289e363d74e69f70140ad035000