From: friendica <info@friendica.com>
Date: Wed, 16 May 2012 05:30:47 +0000 (-0700)
Subject: Merge https://github.com/friendica/dir into dpull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1872cf2b2d14be5c4b8fbc9e2cf61f9fcd9e2f88;p=friendica.git

Merge https://github.com/friendica/dir into dpull
---

1872cf2b2d14be5c4b8fbc9e2cf61f9fcd9e2f88