From: friendica <info@friendica.com>
Date: Sat, 16 Jun 2012 23:25:40 +0000 (-0700)
Subject: Merge pull request #336 from hauke68/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=217bd2a7045008cab2f025291d7c5a74bb49d918;p=friendica.git

Merge pull request #336 from hauke68/master

Pull request
---

217bd2a7045008cab2f025291d7c5a74bb49d918