From: Friendika <info@friendika.com>
Date: Mon, 18 Apr 2011 22:20:45 +0000 (-0700)
Subject: Merge branch 'omigeot-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2563c49cdd5d4770278ff51abb7285c458c8a920;p=friendica.git

Merge branch 'omigeot-master'
---

2563c49cdd5d4770278ff51abb7285c458c8a920