From: pixelroot <info@pixelbits.de>
Date: Sat, 22 Sep 2012 06:36:50 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=994c37b85b9c6c1830c79095f4311a7a2dbcdf70;p=friendica.git

Merge branch 'master' of http://github.com/friendica/friendica
---

994c37b85b9c6c1830c79095f4311a7a2dbcdf70