From: Roland Haeder Date: Sun, 1 Mar 2015 17:30:18 +0000 (+0100) Subject: Merge branch 'nightly' of gitorious.org:social/mainline into nightly X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1e5232502571dcb1e8f107b9d27c54d91f0b8692;p=quix0rs-gnu-social.git Merge branch 'nightly' of gitorious.org:social/mainline into nightly Conflicts: plugins/Blog/BlogPlugin.php plugins/Blog/classes/Blog_entry.php Signed-off-by: Roland Haeder --- 1e5232502571dcb1e8f107b9d27c54d91f0b8692