From: Olivier Migeot <olivier@migeot.org>
Date: Wed, 13 Apr 2011 12:25:13 +0000 (+0200)
Subject: Merge remote branch 'mike/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e051fa36052efbea2bdd9629d41851398f63ad71;p=friendica.git

Merge remote branch 'mike/master'
---

e051fa36052efbea2bdd9629d41851398f63ad71