From: Max Weller <git@max-weller.de>
Date: Sat, 23 Jun 2012 20:59:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'sebastian/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cbf1cab0da2b67c8a88f301ce9ce6b83db27ec0b;p=friendica.git

Merge remote-tracking branch 'sebastian/master'
---

cbf1cab0da2b67c8a88f301ce9ce6b83db27ec0b