From: olivierm <olivier@migeot.org>
Date: Wed, 23 Feb 2011 09:18:11 +0000 (+0100)
Subject: Merge commit 'mike/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3ad7c395fb9a33319531e04673563e7c9983d8f0;p=friendica.git

Merge commit 'mike/master'
---

3ad7c395fb9a33319531e04673563e7c9983d8f0