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

Merge branch 'omigeot-master'
---

64e92f34d94bec6800fd01a971b4bd901b3a51ca