From: olivierm <olivier@migeot.org>
Date: Thu, 3 Mar 2011 09:09:48 +0000 (+0100)
Subject: Merge commit 'mike/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=07ebc15612807512422ba84060914c5c4c853102;p=friendica.git

Merge commit 'mike/master'
---

07ebc15612807512422ba84060914c5c4c853102