From: tony baldwin <tony@baldwinsoftware.com>
Date: Tue, 10 Apr 2012 12:46:37 +0000 (-0400)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d06df8bed045983ef2ad7918905dbf714ba2739a;p=friendica-addons.git

Merge remote branch 'upstream/master'
---

d06df8bed045983ef2ad7918905dbf714ba2739a