From: fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 31 Aug 2012 13:03:27 +0000 (-0400)
Subject: Merge remote branch 'friendica/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7b71fec6222988a89423ee4584c87927f1a6e149;hp=b25823602257423435e73b0cdcea677e366afb9d;p=friendica-addons.git

Merge remote branch 'friendica/master'
---