From: Friendika <info@friendika.com>
Date: Fri, 16 Sep 2011 13:51:33 +0000 (-0700)
Subject: Merge branch 'friday'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9b5d5eca07099f9517be617b0cfb903988b01583;p=friendica.git

Merge branch 'friday'
---

9b5d5eca07099f9517be617b0cfb903988b01583