From: friendica Date: Sat, 23 Jun 2012 12:47:31 +0000 (-0700) Subject: Merge https://github.com/friendica/friendica into pull X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=49360b0a646d78ba8a5dbfee039f3d4929e0c4d0;p=friendica.git Merge https://github.com/friendica/friendica into pull --- 49360b0a646d78ba8a5dbfee039f3d4929e0c4d0