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

Merge commit 'mike/master'
---

75a8b684fcb198f03a4dc2f208395179144f5fe7