From: Olivier Migeot <olivier@migeot.org>
Date: Mon, 28 Mar 2011 10:11:10 +0000 (+0200)
Subject: Merge remote branch 'mike/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=da546588db1863dd240a4c738644372fc4d183e6;p=friendica.git

Merge remote branch 'mike/master'
---

da546588db1863dd240a4c738644372fc4d183e6