From: Friendika <info@friendika.com>
Date: Thu, 24 Feb 2011 21:30:03 +0000 (-0800)
Subject: Merge branch 'omigeot-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f6788dc5f670e852ea9e1be001892527e5ae76dd;p=friendica.git

Merge branch 'omigeot-master'
---

f6788dc5f670e852ea9e1be001892527e5ae76dd