From: Roland Haeder <roland@mxchange.org>
Date: Wed, 18 Feb 2015 15:48:25 +0000 (+0100)
Subject: Merge branch 'social-master' into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7d9d4924cb93e6184b655040f70c7a7256b3cdfc;p=quix0rs-gnu-social.git

Merge branch 'social-master' into nightly

Conflicts:
	classes/File.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

7d9d4924cb93e6184b655040f70c7a7256b3cdfc