From: Friendika <info@friendika.com>
Date: Mon, 4 Apr 2011 22:43:54 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/erikl/friendika into erikl-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a0d2747d527221fc517e5d277035d6e5b07ebf93;p=friendica.git

Merge branch 'master' of https://github.com/erikl/friendika into erikl-master
---

a0d2747d527221fc517e5d277035d6e5b07ebf93