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

Merge branch 'omigeot-master'
---

b52fd6c2db3f40156ae3a05c175ca4c092b39dfa