From: Friendika <info@friendika.com>
Date: Thu, 10 Nov 2011 02:29:30 +0000 (-0800)
Subject: Merge branch 'master' into contacts
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e35f3f1ada264c03fe0c54e5ed0672c5a66ca001;p=friendica.git

Merge branch 'master' into contacts
---

e35f3f1ada264c03fe0c54e5ed0672c5a66ca001