From: olivierm <olivier@migeot.org>
Date: Thu, 24 Feb 2011 17:52:08 +0000 (+0100)
Subject: Merge commit 'mike/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d2c47924eb186a0839fe107b271ccbf27d15fe10;p=friendica.git

Merge commit 'mike/master'
---

d2c47924eb186a0839fe107b271ccbf27d15fe10