From: Friendika <info@friendika.com>
Date: Mon, 28 Mar 2011 22:42:01 +0000 (-0700)
Subject: Merge branch 'omigeot-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=266a93c584ac4fd968e4f1e784a20c04ffb56618;p=friendica.git

Merge branch 'omigeot-master'
---

266a93c584ac4fd968e4f1e784a20c04ffb56618