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

Merge branch 'omigeot-master'
---

0d161c6ef60e4bcfe36f0a9b1e090955156a162a