From: Roland Haeder Date: Wed, 25 Feb 2015 01:30:21 +0000 (+0100) Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f4ec1c998d29cb4f9335e15e65cd43ff035583d2;p=quix0rs-gnu-social.git Merge branch 'nightly' of gitorious.org:social/mainline into nightly Conflicts: plugins/VideoThumbnails/VideoThumbnailsPlugin.php Signed-off-by: Roland Haeder --- f4ec1c998d29cb4f9335e15e65cd43ff035583d2