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

Merge remote branch 'mike/master'
---

85f709320b588f3231875d097217bd9abd223c9f