From: Friendika <info@friendika.com>
Date: Thu, 13 Jan 2011 10:07:57 +0000 (-0800)
Subject: Merge branch 'dev'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b0a03c328fae157e20facf982552147bbadb2542;p=friendica.git

Merge branch 'dev'
---

b0a03c328fae157e20facf982552147bbadb2542