From: fabrixxm <fabrix.xm@gmail.com>
Date: Tue, 24 Jul 2012 14:40:33 +0000 (-0400)
Subject: Merge remote branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a3de3d8008f6f90a378a1f8adf2b8b5720d3b2cb;p=friendica-addons.git

Merge remote branch 'friendica/master'
---

a3de3d8008f6f90a378a1f8adf2b8b5720d3b2cb