From: Simon <simon@kisikew.org>
Date: Wed, 14 Mar 2012 05:10:02 +0000 (-0700)
Subject: Merge pull request #131 from simonlnu/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb77bfa648c3dd06d1b3f343f5ad98f32a7ce313;p=friendica.git

Merge pull request #131 from simonlnu/master

massive work done to both dispys, mostly -dark
---

fb77bfa648c3dd06d1b3f343f5ad98f32a7ce313