From: Friendika <info@friendika.com>
Date: Wed, 30 Mar 2011 21:33:04 +0000 (-0700)
Subject: Merge branch 'omigeot-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f5d782f5c5750fcc3d8fffb87abdc698ccea1155;p=friendica.git

Merge branch 'omigeot-master'
---

f5d782f5c5750fcc3d8fffb87abdc698ccea1155